summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-16 14:18:06 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-16 14:18:06 -0800
commit147d071816c7011d24c195a9d6fca251ad312532 (patch)
treedcfc810867c9fb94435f8649cb5ae3b0ab882adc /builtin
parent57d6b07f6b6d6abb3f5d0a263f676528ba3dcc15 (diff)
parentabe199808c6586047fb7255b80e3d17ffc26bf6c (diff)
downloadgit-147d071816c7011d24c195a9d6fca251ad312532.tar.gz
Merge branch 'jc/checkout-out-of-unborn' into maint
* jc/checkout-out-of-unborn: git checkout -b: allow switching out of an unborn branch
Diffstat (limited to 'builtin')
-rw-r--r--builtin/checkout.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index f1984d9933..a76aa2a6fd 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -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);
}