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 /builtin/commit.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 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index cbc9613ec6..66ffe31736 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1392,7 +1392,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) if (get_sha1("HEAD", sha1)) current_head = NULL; else { - current_head = lookup_commit(sha1); + current_head = lookup_commit_or_die(sha1, "HEAD"); if (!current_head || parse_commit(current_head)) die(_("could not parse HEAD commit")); } @@ -1424,6 +1424,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) pptr = &commit_list_insert(c->item, pptr)->next; } else if (whence == FROM_MERGE) { struct strbuf m = STRBUF_INIT; + struct commit *commit; FILE *fp; if (!reflog_msg) @@ -1437,7 +1438,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix) unsigned char sha1[20]; if (get_sha1_hex(m.buf, sha1) < 0) die(_("Corrupt MERGE_HEAD file (%s)"), m.buf); - pptr = &commit_list_insert(lookup_commit(sha1), pptr)->next; + commit = lookup_commit_or_die(sha1, "MERGE_HEAD"); + pptr = &commit_list_insert(commit, pptr)->next; } fclose(fp); strbuf_release(&m); |