diff options
| author | Erik Faye-Lund <kusmabite@gmail.com> | 2012-05-08 19:22:33 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-08 10:36:55 -0700 |
| commit | 8338f771fe9720766dfcb25b6dca58832e24a0fd (patch) | |
| tree | 6bb1594c45fffde796364ee577ff34cf548fee17 /builtin/checkout.c | |
| parent | abe199808c6586047fb7255b80e3d17ffc26bf6c (diff) | |
| download | git-8338f771fe9720766dfcb25b6dca58832e24a0fd.tar.gz | |
checkout: do not corrupt HEAD on empty repo
In abe1998 ("git checkout -b: allow switching out of an unborn
branch"), a code-path overly-optimisticly assumed that a
branch-name was specified. This is not always the case, and as
a result a NULL-pointer was attempted printed to .git/HEAD.
This could lead to at least two different failure modes:
1) vsnprintf formated the NULL-string as something useful (e.g
"(null)")
2) vsnprintf crashed
Neither were very convenient for formatting a new HEAD-reference.
To fix this, reintroduce some strictness so we only take this
new codepath if a banch-name was specified.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 b76e2c0451..44ecc22e52 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1100,7 +1100,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; |