development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/checkout-out-of-unborn' into maint

Browse source 
* jc/checkout-out-of-unborn:
  git checkout -b: allow switching out of an unborn branch
This commit is contained in:
Junio C Hamano 2012-02-16 14:18:06 -08:00
parent 57d6b07f6b abe199808c
commit 147d071816
2 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
builtin/checkout.c
View file

@ -922,6 +922,17 @@ static int parse_branchname_arg(int argc, const char **argv,
return argcount;
}
static int switch_unborn_to_new_branch(struct checkout_opts *opts)
{
int status;
struct strbuf branch_ref = STRBUF_INIT;
strbuf_addf(&branch_ref, "refs/heads/%s", opts->new_branch);
status = create_symref("HEAD", branch_ref.buf, "checkout -b");
strbuf_release(&branch_ref);
return status;
}
int cmd_checkout(int argc, const char **argv, const char *prefix)
{
struct checkout_opts opts;
@ -1093,5 +1104,13 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
if (opts.writeout_stage)
die(_("--ours/--theirs is incompatible with switching branches."));
if (!new.commit) {
unsigned char rev[20];
int flag;
if (!read_ref_full("HEAD", rev, 0, &flag) &&
(flag & REF_ISSYMREF) && is_null_sha1(rev))
return switch_unborn_to_new_branch(&opts);
}
return switch_branches(&opts, &new);
}

11
t/t2015-checkout-unborn.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh
test_description='checkout from unborn branch protects contents'
test_description='checkout from unborn branch'
. ./test-lib.sh
test_expect_success 'setup' '
@ -37,4 +37,13 @@ test_expect_success 'checkout from unborn merges identical index contents' '
git checkout -b new origin
'
test_expect_success 'checking out another branch from unborn state' '
git checkout --orphan newroot &&
git checkout -b anothername &&
test_must_fail git show-ref --verify refs/heads/newroot &&
git symbolic-ref HEAD >actual &&
echo refs/heads/anothername >expect &&
test_cmp expect actual
'
test_done