Re: branch.<branch>.merge and --format='%(upstream)'

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 16, 2009, 15:46 UTC
Message-ID: <7v7hzcdvvr.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20090616122312.GB5227@coredump.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 13 quoted lines

> On Tue, Jun 16, 2009 at 01:08:02PM +0200, Santi Béjar wrote:
>
>>   I've noticed that having branch.<branch>.merge set with the branch
>> name, and not with the full ref, cause problems with
>> --format='%(upstream)'  and also with the "branch -av" and "git
>> status" upstream branch outputs. But git-fetch and git-pull works ok,
>> so it is a valid setting.
>
> 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.