diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-07 14:45:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-08 10:36:53 -0800 |
| commit | 274a5c06d525da8c9720ae60454fba6779523c52 (patch) | |
| tree | a7ad758e0777c7e7fa6486243b8b6edc2de129e1 | |
| parent | ae8e4c9ce10ea9439a88b79a40aeff4696d40416 (diff) | |
| download | git-274a5c06d525da8c9720ae60454fba6779523c52.tar.gz | |
merge: record tag objects without peeling in MERGE_HEAD
Otherwise, "git commit" wouldn't have a way to tell that we were in the
middle of merging an annotated or signed tag, not a plain commit, after
"git merge" stops to ask the user to resolve conflicts.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/merge.c | 13 | ||||
| -rwxr-xr-x | t/t7600-merge.sh | 6 |
2 files changed, 15 insertions, 4 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 8d4eb4e423..7158e8e2d2 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1045,9 +1045,16 @@ static void write_merge_state(void) struct commit_list *j; struct strbuf buf = STRBUF_INIT; - for (j = remoteheads; j; j = j->next) - strbuf_addf(&buf, "%s\n", - sha1_to_hex(j->item->object.sha1)); + for (j = remoteheads; j; j = j->next) { + unsigned const char *sha1; + struct commit *c = j->item; + if (c->util && merge_remote_util(c)->obj) { + sha1 = merge_remote_util(c)->obj->sha1; + } else { + sha1 = c->object.sha1; + } + strbuf_addf(&buf, "%s\n", sha1_to_hex(sha1)); + } fd = open(git_path("MERGE_HEAD"), O_WRONLY | O_CREAT, 0666); if (fd < 0) die_errno(_("Could not open '%s' for writing"), diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index b91d022bc6..5d8c428543 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -96,7 +96,11 @@ verify_parents () { verify_mergeheads () { printf '%s\n' "$@" >mergehead.expected && - test_cmp mergehead.expected .git/MERGE_HEAD + while read sha1 rest + do + git rev-parse $sha1 + done <.git/MERGE_HEAD >mergehead.actual && + test_cmp mergehead.expected mergehead.actual } verify_no_mergehead () { |