mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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-12 22:43:44 -08:00
parent b95ffc143f abe199808c
commit aa47ec99d1
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
builtin/checkout.c
View File

@ -908,6 +908,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;
@ -1079,5 +1090,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);
}