From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 Oct 2008 22:15:53 GMT
Subject: Re: "git checkout: --track and --no-track require -b" check accidentally resurrected?
Message-ID: <7vhc785izq.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1224377652.19061.12.camel@mattlaptop2.local>

Matt McCutchen <matt@mattmccutchen.net> writes:

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

Again, good eyes.  I think the two lines should go; my fault at cdb22c4
(Merge branch 'jc/better-conflict-resolution' into next, 2008-09-02).

Thanks.