From c17b229454ac3f5d20fd0cff3a663b03c13cb38e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 5 Jun 2011 22:17:04 -0700 Subject: checkout -b : correctly detect existing branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When create a new branch, we fed "refs/heads/" as a string to get_sha1() and expected it to fail when a branch already exists. The right way to check if a ref exists is to check with resolve_ref(). A naïve solution that might appear attractive but does not work is to forbid slashes in get_describe_name() but that will not work. A describe name is is in the form of "ANYTHING-g", and that ANYTHING part comes from a original tag name used in the repository the user ran the describe command. A sick user could have a confusing hierarchical tag whose name is "refs/heads/foobar" (stored as refs/tags/refs/heads/foobar") to generate a describe name "refs/heads/foobar-6-g02ac983", and we should be able to use that name to refer to the object whose name is 02ac983. Signed-off-by: Junio C Hamano --- t/t2018-checkout-branch.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 't/t2018-checkout-branch.sh') diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh index 1caffeac07..741d84257b 100755 --- a/t/t2018-checkout-branch.sh +++ b/t/t2018-checkout-branch.sh @@ -163,4 +163,15 @@ test_expect_success 'checkout -f -B to an existing branch with mergeable changes test_must_fail test_dirty_mergeable ' +test_expect_success 'checkout -b ' ' + git tag -f -m "First commit" initial initial && + git checkout -f change1 && + name=$(git describe) && + git checkout -b $name && + git diff --exit-code change1 && + echo "refs/heads/$name" >expect && + git symbolic-ref HEAD >actual && + test_cmp expect actual +' + test_done -- cgit v1.2.3