diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-03-12 05:27:25 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 19:23:47 +0300 |
commit | 5ac913c6eb266e836f91c39c3b03bcbdc06475c6 (patch) | |
tree | 46b906fb7cce225a5801b11228bb7182255dc653 /resolve-undo.h | |
parent | 6dcb462530b1142a0fc1ad326dfd68ce1cde7387 (diff) |
resolve-undo: convert struct resolve_undo_info to object_id
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>
Diffstat (limited to 'resolve-undo.h')
-rw-r--r-- | resolve-undo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/resolve-undo.h b/resolve-undo.h index 46306455ed..87291904bd 100644 --- a/resolve-undo.h +++ b/resolve-undo.h @@ -3,7 +3,7 @@ struct resolve_undo_info { unsigned int mode[3]; - unsigned char sha1[3][20]; + struct object_id oid[3]; }; extern void record_resolve_undo(struct index_state *, struct cache_entry *); |