mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
![brian m. carlson](/assets/img/avatar_default.png)
Convert the sha1 member of this struct to be an array of struct object_id instead. This change is needed to convert find_unique_abbrev. Convert some instances of hard-coded constants to use the_hash_algo as well. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
18 lines
610 B
C
18 lines
610 B
C
#ifndef RESOLVE_UNDO_H
|
|
#define RESOLVE_UNDO_H
|
|
|
|
struct resolve_undo_info {
|
|
unsigned int mode[3];
|
|
struct object_id oid[3];
|
|
};
|
|
|
|
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 struct pathspec *);
|
|
extern void unmerge_marked_index(struct index_state *);
|
|
|
|
#endif
|