undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix "checkout --track -b newbranch" on detached HEAD

Browse Source 
The test to make sure that checkout fails when --track was asked for and
we cannot set up tracking information in t7201 was wrong, and it turns out
that the implementation for that feature itself was buggy.  This fixes it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2008-10-16 23:37:44 -07:00
parent 8ed0a740dd
commit 51a94af845
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
branch.c
View File

@ -129,7 +129,9 @@ void create_branch(const char *head,
die("Cannot setup tracking information; starting point is not a branch."); die("Cannot setup tracking information; starting point is not a branch.");
break; break;
case 1: case 1:
/* Unique completion -- good */ /* Unique completion -- good, only if it is a real ref */
if (track == BRANCH_TRACK_EXPLICIT && !strcmp(real_ref, "HEAD"))
die("Cannot setup tracking information; starting point is not a branch.");
break; break;
default: default:
die("Ambiguous object name: '%s'.", start_name); die("Ambiguous object name: '%s'.", start_name);

14
t/t7201-co.sh
View File

@ -330,12 +330,14 @@ test_expect_success \
test "$(git config branch.track2.merge)" test "$(git config branch.track2.merge)"
git config branch.autosetupmerge false' git config branch.autosetupmerge false'
test_expect_success \ test_expect_success 'checkout w/--track from non-branch HEAD fails' '
'checkout w/--track from non-branch HEAD fails' ' git checkout master^0 &&
git checkout -b delete-me master && test_must_fail git symbolic-ref HEAD &&
rm .git/refs/heads/delete-me && test_must_fail git checkout --track -b track &&
test refs/heads/delete-me = "$(git symbolic-ref HEAD)" && test_must_fail git rev-parse --verify track &&
test_must_fail git checkout --track -b track' test_must_fail git symbolic-ref HEAD &&
test "z$(git rev-parse master^0)" = "z$(git rev-parse HEAD)"
'
test_expect_success 'checkout an unmerged path should fail' ' test_expect_success 'checkout an unmerged path should fail' '
rm -f .git/index && rm -f .git/index &&