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

Convert struct object to object_id

Browse Source 
struct object is one of the major data structures dealing with object
IDs.  Convert it to use struct object_id instead of an unsigned char
array.  Convert get_object_hash to refer to the new member as well.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
brian m. carlson
2015-11-10 02:22:28 +00:00
committed by Jeff King
parent 7999b2cf77
commit f2fd0760f6
54 changed files with 256 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/pull.c
View File

@ -743,7 +743,7 @@ static int get_octopus_merge_base(unsigned char *merge_base,
if (!result)
return 1;
hashcpy(merge_base, result->item->object.sha1);
hashcpy(merge_base, get_object_hash(result->item->object));
return 0;
}