summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-30 20:10:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-07 00:32:15 (GMT)
commitabe199808c6586047fb7255b80e3d17ffc26bf6c (patch)
treebf13d37ebb63f0448d5cbb2bcb2e2212ff990d4a /builtin/checkout.c
parent04f6785a089e552585ba022f9d9054eca385ca67 (diff)
downloadgit-abe199808c6586047fb7255b80e3d17ffc26bf6c.zip
git-abe199808c6586047fb7255b80e3d17ffc26bf6c.tar.gz
git-abe199808c6586047fb7255b80e3d17ffc26bf6c.tar.bz2
git checkout -b: allow switching out of an unborn branch
Running "git checkout -b another" immediately after "git init" when you do not even have a commit on 'master' fails with: $ git checkout -b another fatal: You are on a branch yet to be born This is unnecessary, if we redefine "git checkout -b $name" that does not take any $start_point (which has to be a commit) as "I want to check out a new branch $name from the state I am in". Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 4c20dae..b76e2c0 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -916,6 +916,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;
@@ -1089,5 +1100,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;
+
+ resolve_ref("HEAD", rev, 0, &flag);
+ if ((flag & REF_ISSYMREF) && is_null_sha1(rev))
+ return switch_unborn_to_new_branch(&opts);
+ }
return switch_branches(&opts, &new);
}