Merge branch 'cw/no-detaching-an-unborn' into maint

"git checkout --detach", when you are still on an unborn branch,
should be forbidden, but it wasn't.

* cw/no-detaching-an-unborn:
git-checkout: disallow --detach on unborn branch

diff --git a/builtin/checkout.c b/builtin/checkout.c
index e8c1b1f189f077529ef2a79accb46ef21a9b8fe7..3980d5d06ea5aba4f4d6d30089307fe76c8adff9 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -915,6 +915,8 @@ static int switch_unborn_to_new_branch(struct checkout_opts *opts)
        int status;
        struct strbuf branch_ref = STRBUF_INIT;
 
+       if (!opts->new_branch)
+               die(_("You are on a branch yet to be born"));
        strbuf_addf(&branch_ref, "refs/heads/%s", opts->new_branch);
        status = create_symref("HEAD", branch_ref.buf, "checkout -b");
        strbuf_release(&branch_ref);

diff --git a/t/t2017-checkout-orphan.sh b/t/t2017-checkout-orphan.sh
index 0e3b8582f2a3edebb0d9eea7fcebaa88f305fd73..655f278c5f87926311979732eb6c129a14dd87d3 100755 (executable)
--- a/t/t2017-checkout-orphan.sh
+++ b/t/t2017-checkout-orphan.sh
@@ -116,4 +116,10 @@ test_expect_success '--orphan refuses to switch if a merge is needed' '
        git reset --hard
 '
 
+test_expect_success 'cannot --detach on an unborn branch' '
+       git checkout master &&
+       git checkout --orphan new &&
+       test_must_fail git checkout --detach
+'
+
 test_done