summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-13 06:43:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-13 06:43:45 (GMT)
commitaa47ec99d1ef979bbf5eca93c0152dd0e636b605 (patch)
treedced10255e2bbf702a14763a480aa1e10e54fea0 /builtin/checkout.c
parentb95ffc143fee155e9ef7ef5e4def38c58febf2ee (diff)
parentabe199808c6586047fb7255b80e3d17ffc26bf6c (diff)
downloadgit-aa47ec99d1ef979bbf5eca93c0152dd0e636b605.zip
git-aa47ec99d1ef979bbf5eca93c0152dd0e636b605.tar.gz
git-aa47ec99d1ef979bbf5eca93c0152dd0e636b605.tar.bz2
Merge branch 'jc/checkout-out-of-unborn'
* jc/checkout-out-of-unborn: git checkout -b: allow switching out of an unborn branch
Diffstat (limited to 'builtin/checkout.c')
-rw-r--r--builtin/checkout.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 5bf96ba..6b9061f 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -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);
}