diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-21 10:49:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-21 10:49:26 -0700 |
| commit | d25a265220f7e9a50693d0ec4bb05c7be0539d69 (patch) | |
| tree | 34bf878cbc1181b0614ad7ba210d48f0ad550fa3 /revision.c | |
| parent | e63f87a6f7a4e55f50e67b112f26d9a1e4e7f3ab (diff) | |
| parent | baf18fc261ca475343fe3cb9cd2c0dded4bc1bb7 (diff) | |
| download | git-d25a265220f7e9a50693d0ec4bb05c7be0539d69.tar.gz | |
Merge branch 'nd/maint-autofix-tag-in-head' into maint
* nd/maint-autofix-tag-in-head:
Accept tags in HEAD or MERGE_HEAD
merge: remove global variable head[]
merge: use return value of resolve_ref() to determine if HEAD is invalid
merge: keep stash[] a local variable
Conflicts:
builtin/merge.c
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/revision.c b/revision.c index 102456b009..3d2deedaf8 100644 --- 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); |