Convert struct object to object_id
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:
committed by
Jeff King
parent
7999b2cf77
commit
f2fd0760f6
4
remote.c
4
remote.c
@ -2031,8 +2031,8 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
|
||||
argv_array_push(&argv, ""); /* ignored */
|
||||
argv_array_push(&argv, "--left-right");
|
||||
argv_array_pushf(&argv, "%s...%s",
|
||||
sha1_to_hex(ours->object.sha1),
|
||||
sha1_to_hex(theirs->object.sha1));
|
||||
oid_to_hex(&ours->object.oid),
|
||||
oid_to_hex(&theirs->object.oid));
|
||||
argv_array_push(&argv, "--");
|
||||
|
||||
init_revisions(&revs, NULL);
|
||||
|
||||
Reference in New Issue
Block a user