mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-28 04:23:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge: fix incorrect merge message for ambiguous tag/branch

Browse Source 
If we have both a tag and a branch named "foo", then calling
"git merge foo" will warn about the ambiguous ref, but merge
the tag.

When generating the commit message, though, we simply
checked whether "refs/heads/foo" existed, and if it did,
assumed it was a branch. This led to the statement "Merge
branch 'foo'" in the commit message, which is quite wrong.

Instead, we should use dwim_ref to find the actual ref used,
and describe it appropriately.

In addition to the test in t7608, we must also tweak the
expected output of t4202, which was accidentally triggering
this bug.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2009-08-09 06:02:24 -04:00 committed by Junio C Hamano
parent ce06461846
commit 751c59746c
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
builtin-merge.c
View File

@ -358,6 +358,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
struct strbuf bname = STRBUF_INIT; struct strbuf bname = STRBUF_INIT;
const char *ptr; const char *ptr;
char *found_ref;
int len, early; int len, early;
strbuf_branchname(&bname, remote); strbuf_branchname(&bname, remote);
@ -368,14 +369,12 @@ static void merge_name(const char *remote, struct strbuf *msg)
if (!remote_head) if (!remote_head)
die("'%s' does not point to a commit", remote); die("'%s' does not point to a commit", remote);
strbuf_addstr(&buf, "refs/heads/"); if (dwim_ref(remote, strlen(remote), branch_head, &found_ref) > 0) {
strbuf_addstr(&buf, remote); if (!prefixcmp(found_ref, "refs/heads/")) {
resolve_ref(buf.buf, branch_head, 0, NULL); strbuf_addf(msg, "%s\t\tbranch '%s' of .\n",
sha1_to_hex(branch_head), remote);
if (!hashcmp(remote_head->sha1, branch_head)) { goto cleanup;
strbuf_addf(msg, "%s\t\tbranch '%s' of .\n", }
sha1_to_hex(branch_head), remote);
goto cleanup;
} }
/* See if remote matches <name>^^^.. or <name>~<number> */ /* See if remote matches <name>^^^.. or <name>~<number> */

4
t/t4202-log.sh
View File

@ -320,11 +320,11 @@ test_expect_success 'set up more tangled history' '
' '
cat > expect <<\EOF cat > expect <<\EOF
* Merge branch 'reach' * Merge commit 'reach'
|\ |\
| \ | \
| \ | \
*-. \ Merge branches 'octopus-a' and 'octopus-b' *-. \ Merge commit 'octopus-a'; commit 'octopus-b'
|\ \ \ |\ \ \
* | | | seventh * | | | seventh
| | * | octopus-b | | * | octopus-b

2
t/t7608-merge-messages.sh
View File

@ -38,7 +38,7 @@ test_expect_success 'merge tag' '
check_oneline "Merge commit Qtag-1Q" check_oneline "Merge commit Qtag-1Q"
' '
test_expect_failure 'ambiguous tag' ' test_expect_success 'ambiguous tag' '
git checkout -b ambiguous master && git checkout -b ambiguous master &&
test_commit ambiguous && test_commit ambiguous &&
git checkout master && git checkout master &&