diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-14 11:42:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-14 11:42:50 -0700 |
| commit | 3734dbc4abce39c20530e36c2d47d3269ac0e6cd (patch) | |
| tree | abe8461ee17211ec971a57831d118288e260f691 /builtin/checkout.c | |
| parent | Merge branch 'jk/maint-tformat-with-z' into maint (diff) | |
| parent | checkout: do not corrupt HEAD on empty repo (diff) | |
| download | tgif-3734dbc4abce39c20530e36c2d47d3269ac0e6cd.tar.xz | |
Merge branch 'ef/checkout-empty' into maint
Running "git checkout" on an unborn branch used to corrupt HEAD
(regression in 1.7.10); this makes it error out.
By Erik Faye-Lund
* ef/checkout-empty:
checkout: do not corrupt HEAD on empty repo
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 160f678b8c..c3647934c7 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1091,7 +1091,7 @@ 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) { + if (!new.commit && opts.new_branch) { unsigned char rev[20]; int flag; |