From: Matt McCutchen <matt@mattmccutchen.net>
Date: Sun, 19 Oct 2008 00:54:12 GMT
Subject: "git checkout: --track and --no-track require -b" check accidentally resurrected?
Message-ID: <1224377652.19061.12.camel@mattlaptop2.local>

Merge commit 9ba929ed resurrected the following two-line check, which
was removed in the first parent and unchanged in the second:

	if (!opts.new_branch && (opts.track != git_branch_track))
		die("git checkout: --track and --no-track require -b");

Is this intentional?  Does it make a difference?

(I noticed this while carefully examining 9ba929ed to find out why "git
merge" stopped honoring merge.conflictstyle.  Ironically, I hit this bug
again during the examination.)

Matt