From: brian m. carlson Date: Sat, 6 May 2017 22:10:05 +0000 (+0000) Subject: revision: convert prepare_show_merge to struct object_id X-Git-Tag: v2.14.0-rc0~166^2~33 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/68ab61dd099a2ce9f700fa68b9b7cc7722304407 revision: convert prepare_show_merge to struct object_id This is a caller of lookup_commit_or_die, which we will convert later on. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- diff --git a/revision.c b/revision.c index 2b56c3baf0..9453670341 100644 --- a/revision.c +++ b/revision.c @@ -1389,16 +1389,16 @@ static void prepare_show_merge(struct rev_info *revs) { struct commit_list *bases; struct commit *head, *other; - unsigned char sha1[20]; + struct object_id oid; const char **prune = NULL; int i, prune_num = 1; /* counting terminating NULL */ - if (get_sha1("HEAD", sha1)) + if (get_oid("HEAD", &oid)) die("--merge without HEAD?"); - head = lookup_commit_or_die(sha1, "HEAD"); - if (get_sha1("MERGE_HEAD", sha1)) + head = lookup_commit_or_die(oid.hash, "HEAD"); + if (get_oid("MERGE_HEAD", &oid)) die("--merge without MERGE_HEAD?"); - other = lookup_commit_or_die(sha1, "MERGE_HEAD"); + other = lookup_commit_or_die(oid.hash, "MERGE_HEAD"); add_pending_object(revs, &head->object, "HEAD"); add_pending_object(revs, &other->object, "MERGE_HEAD"); bases = get_merge_bases(head, other);