Skip to content

Commit

Permalink
Merge branch 'cw/no-detaching-an-unborn'
Browse files Browse the repository at this point in the history
"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
  • Loading branch information
Junio C Hamano committed Jul 9, 2012
2 parents 967abba + 8ced1aa commit 45c96c0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
2 changes: 2 additions & 0 deletions builtin/checkout.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 6 additions & 0 deletions t/t2017-checkout-orphan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 45c96c0

Please sign in to comment.