From 828e32b82e3e2bb10d6d730d3abe505063b481f6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 19 Oct 2008 15:32:35 -0700 Subject: [PATCH] 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 --- builtin-checkout.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/builtin-checkout.c b/builtin-checkout.c index ad04a184a..57b94d282 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"); -- 2.30.2