mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-03 09:56:15 +02:00
Code

Show interpreted branch name in error messages 

Change the error message when doing: "git branch @{-1}",
"git checkout -b @{-1}", or "git branch -m foo @{-1}"

 * was: A branch named '@{-1}' already exists.
 * now: A branch named 'bar' already exists.

Signed-off-by: Conrad Irwin <conrad.irwin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Conrad Irwin 2011-08-20 14:49:49 -07:00 committed by Junio C Hamano
parent 55c4a67307
commit 587a9ee7da
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
branch.c
View File

@ -146,7 +146,7 @@ int validate_new_branchname(const char *name, struct strbuf *ref, int force)
if (!ref_exists(ref->buf))
return 0;
else if (!force)
die("A branch named '%s' already exists.", name);
die("A branch named '%s' already exists.", ref->buf + strlen("refs/heads/"));
head = resolve_ref("HEAD", sha1, 0, NULL);
if (!is_bare_repository() && head && !strcmp(head, ref->buf))

9
t/t2018-checkout-branch.sh
View File

@ -118,6 +118,15 @@ test_expect_success 'checkout -b to an existing branch fails' '
test_must_fail do_checkout branch2 $HEAD2
'
test_expect_success 'checkout -b to @{-1} fails with the right branch name' '
git reset --hard HEAD &&
git checkout branch1 &&
git checkout branch2 &&
echo >expect "fatal: A branch named '\''branch1'\'' already exists." &&
test_must_fail git checkout -b @{-1} 2>actual &&
test_cmp expect actual
'
test_expect_success 'checkout -B to an existing branch resets branch to HEAD' '
git checkout branch1 &&