From cc70148385d5a36682d3b67fdaa726590577f257 Mon Sep 17 00:00:00 2001 From: Tay Ray Chuan Date: Tue, 10 Aug 2010 00:52:26 +0800 Subject: [PATCH] builtin/checkout: handle -B from detached HEAD correctly 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 Signed-off-by: Junio C Hamano --- branch.c | 2 +- t/t2018-checkout-branch.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/branch.c b/branch.c index 2ab42aaf4d..93dc866f8c 100644 --- a/branch.c +++ b/branch.c @@ -159,7 +159,7 @@ void create_branch(const char *head, dont_change_ref = 1; else if (!force) 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."); forcing = 1; } diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh index 1caffeac07..fa69016381 100755 --- a/t/t2018-checkout-branch.sh +++ b/t/t2018-checkout-branch.sh @@ -124,6 +124,12 @@ test_expect_success 'checkout -B to an existing branch resets branch to HEAD' ' 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' ' git checkout branch1 && -- 2.11.4.GIT