summaryrefslogtreecommitdiff
path: root/builtin-checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-10-19 15:32:35 -0700
committerJunio C Hamano <gitster@pobox.com>2008-10-19 15:32:42 -0700
commit828e32b82e3e2bb10d6d730d3abe505063b481f6 (patch)
tree41aafda0561e699aaf2154024144eb7524c58547 /builtin-checkout.c
parente137a892d88cc40d7c0df45c06c08d144f7b3ce2 (diff)
downloadgit-828e32b82e3e2bb10d6d730d3abe505063b481f6.tar.gz
Fix mismerge at cdb22c4 in builtin-checkout.c
The code to complain when -b is not given but an explicit --track/--no-track override was given from the command line was unchanged on one branch and reworked on the other branch. The merge result incorrectly kept it. Spotted by Matt McCutchen. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-checkout.c')
-rw-r--r--builtin-checkout.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c
index ad04a184a2..57b94d2829 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -635,9 +635,6 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
git_xmerge_config("merge.conflictstyle", conflict_style, NULL);
}
- if (!opts.new_branch && (opts.track != git_branch_track))
- die("git checkout: --track and --no-track require -b");
-
if (opts.force && opts.merge)
die("git checkout: -f and -m are incompatible");