diff options
| -rw-r--r-- | branch.c | 2 | ||||
| -rwxr-xr-x | t/t2018-checkout-branch.sh | 9 |
2 files changed, 10 insertions, 1 deletions
@@ -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)) diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh index b66db2b88..75874e85d 100755 --- a/t/t2018-checkout-branch.sh +++ b/t/t2018-checkout-branch.sh @@ -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 && |