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>
Junio C Hamano committed
Oct 19, 2008 at 15:32 UTC
828e32b82e3e2bb10d6d730d3abe505063b481f6
1 file changed
-3
builtin-checkout.c
-3
@@ -635,9 +635,6 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
635
git_xmerge_config("merge.conflictstyle", conflict_style, NULL);
636
}
637
638
- if (!opts.new_branch && (opts.track != git_branch_track))
639
- die("git checkout: --track and --no-track require -b");
640
-
638
if (opts.force && opts.merge)
639
die("git checkout: -f and -m are incompatible");
640