mirror of
https://github.com/git/git.git
synced 2024-11-13 20:53:02 +01:00
b8bba41925
Recently introduced resolve_undo_read() expected arithmetic to (void *) to work on byte-addresses. Correct this. Noticed by Brandon Casey. Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 lines
546 B
C
16 lines
546 B
C
#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
|