mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve-undo: convert struct resolve_undo_info to object_id

Browse Source 
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>
This commit is contained in:
brian m. carlson
2018-03-12 02:27:25 +00:00
committed by Junio C Hamano
parent 6dcb462530
commit 5ac913c6eb
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resolve-undo.h
View File

@ -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 *);