From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [Bug] branch.*.merge interpreted too strictly by tracking logic
Date: Wed, 05 Feb 2014 13:05:04 -0800 [thread overview]
Message-ID: <xmqqbnyl2run.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140205205030.GA16394@sigill.intra.peff.net> (Jeff King's message of "Wed, 5 Feb 2014 15:50:30 -0500")
Jeff King <peff@peff.net> writes:
> Is it legal to put an unqualified ref there? A wise man once said[1]:
>
> > Actually, it is broken in a lot of places. for-each-ref relies on
> > the same code as "git status", "git checkout", etc, which will all
> > fail to display tracking info. I believe the same code is also used
> > for updating tracking branches on push. So I'm not sure if it was
> > ever intended to be a valid setting.
>
> It wasn't. Some places may accept them gracefully by either being
> extra nice or by accident.
>
> I don't recall us ever doing anything after that. I don't have a problem
> with making it work, of course, but I am not sure if it is really a bug.
Once people get used to us being extra nice in some places, other
less nice places start looking more and more like bugs. It is an
unfortunate fact of life, but fixing them up is a good thing for
users. As long as we can make those less nice places nicer
uniformly without bending backwards or introducing unnecessary
ambiguities, that is, and I think this one can be done without
such downsides.
next prev parent reply other threads:[~2014-02-05 21:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-04 22:49 [Bug] branch.*.merge interpreted too strictly by tracking logic Junio C Hamano
2014-02-05 20:50 ` Jeff King
2014-02-05 21:05 ` Junio C Hamano [this message]
2014-02-05 21:08 ` Jeff King
2014-02-05 21:10 ` Junio C Hamano
2014-10-14 22:14 ` [PATCH] checkout: report upstream correctly even with loosely defined branch.*.merge Junio C Hamano
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=xmqqbnyl2run.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.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).