From f2fd0760f62e79609fef7bfd7ecebb002e8e4ced Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Tue, 10 Nov 2015 02:22:28 +0000 Subject: 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 Signed-off-by: Jeff King --- remote.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'remote.c') diff --git a/remote.c b/remote.c index bdae86c618..1abe1de24e 100644 --- a/remote.c +++ b/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); -- cgit v1.2.1