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

builtin/checkout: handle -B from detached HEAD correctly

Browse Source 
Ensure that strcmp() isn't called when head is null.

Previously we were getting segfaults when checkout -B was done from a
detached HEAD.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Tay Ray Chuan 2010-08-10 00:52:26 +08:00 committed by Junio C Hamano
parent 02ac98374e
commit cc70148385
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
branch.c
View File

@ -159,7 +159,7 @@ void create_branch(const char *head,
dont_change_ref = 1; dont_change_ref = 1;
else if (!force) else if (!force)
die("A branch named '%s' already exists.", name); die("A branch named '%s' already exists.", name);
else if (!is_bare_repository() && !strcmp(head, name)) else if (!is_bare_repository() && head && !strcmp(head, name))
die("Cannot force update the current branch."); die("Cannot force update the current branch.");
forcing = 1; forcing = 1;
} }

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

@ -124,6 +124,12 @@ test_expect_success 'checkout -B to an existing branch resets branch to HEAD' '
do_checkout branch2 "" -B do_checkout branch2 "" -B
' '
test_expect_success 'checkout -B to an existing branch from detached HEAD resets branch to HEAD' '
git checkout $(git rev-parse --verify HEAD) &&
do_checkout branch2 "" -B
'
test_expect_success 'checkout -B to an existing branch with an explicit ref resets branch to that ref' ' test_expect_success 'checkout -B to an existing branch with an explicit ref resets branch to that ref' '
git checkout branch1 && git checkout branch1 &&