From: Junio C Hamano <gitster@pobox.com>
To: Matt McCutchen <matt@mattmccutchen.net>
Cc: git <git@vger.kernel.org>
Subject: Re: "git checkout: --track and --no-track require -b" check accidentally resurrected?
Date: Sun, 19 Oct 2008 15:15:53 -0700 [thread overview]
Message-ID: <7vhc785izq.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1224377652.19061.12.camel@mattlaptop2.local> (Matt McCutchen's message of "Sat, 18 Oct 2008 20:54:12 -0400")
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.
next prev parent reply other threads:[~2008-10-19 22:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-19 0:54 "git checkout: --track and --no-track require -b" check accidentally resurrected? Matt McCutchen
2008-10-19 22:15 ` Junio C Hamano [this message]
2008-10-19 22:52 ` Is XDL_MERGE_ZEALOUS too zealous (or maybe not zealous enough)? Junio C Hamano
2008-10-20 3:42 ` Matt McCutchen
2008-10-20 16:17 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vhc785izq.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=matt@mattmccutchen.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).