Merge branch 'maint-1.7.6' into maint-1.7.7

[git.git] / revision.c

diff --git a/revision.c b/revision.c
index 102456b009429eeecdee3a5f8f9a1a0404f1cffa..3d2deedaf8e50c6a71b9750dacf602bb5b9238b9 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1011,10 +1011,12 @@ static void prepare_show_merge(struct rev_info *revs)
        const char **prune = NULL;
        int i, prune_num = 1; /* counting terminating NULL */
 
-       if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1)))
+       if (get_sha1("HEAD", sha1))
                die("--merge without HEAD?");
-       if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1)))
+       head = lookup_commit_or_die(sha1, "HEAD");
+       if (get_sha1("MERGE_HEAD", sha1))
                die("--merge without MERGE_HEAD?");
+       other = lookup_commit_or_die(sha1, "MERGE_HEAD");
        add_pending_object(revs, &head->object, "HEAD");
        add_pending_object(revs, &other->object, "MERGE_HEAD");
        bases = get_merge_bases(head, other, 1);