Skip to main content

Browse the archive

Revision 053a08f5bba3444d40516baf30a5d61e42e4fb93 authored by Junio C Hamano on 16 October 2012, 18:44:37 UTC, committed by Junio C Hamano on 16 October 2012, 18:44:37 UTC 
Merge branch 'jk/maint-http-half-auth-push'
 
Fixes a regression in maint-1.7.11 (v1.7.11.7), maint (v1.7.12.1)
and master (v1.8.0-rc0).

* jk/maint-http-half-auth-push:
  http: fix segfault in handle_curl_result
2 parent s 9306b5b + 188923f
Raw File
resolve-undo.h 
#ifndef RESOLVE_UNDO_H
#define RESOLVE_UNDO_H

struct resolve_undo_info {
	unsigned int mode[3];
	unsigned char sha1[3][20];
};

extern void record_resolve_undo(struct index_state *, struct cache_entry *);
extern void resolve_undo_write(struct strbuf *, struct string_list *);
extern struct string_list *resolve_undo_read(const char *, unsigned long);
extern void resolve_undo_clear_index(struct index_state *);
extern int unmerge_index_entry_at(struct index_state *, int);
extern void unmerge_index(struct index_state *, const char **);

#endif
back to top