From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 Oct 2008 22:32:35 +0000 (-0700)
Subject: Fix mismerge at cdb22c4 in builtin-checkout.c
X-Git-Tag: v1.6.1-rc1~137
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=828e32b82e3e2bb10d6d730d3abe505063b481f6;p=git.git

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>
---

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");