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

From: Jeff King <peff@peff.net>
Date: Jun 16, 2009, 12:23 UTC
Message-ID: <20090616122312.GB5227@coredump.intra.peff.net>
In-Reply-To: <adf1fd3d0906160408s668f7a3fj5725cc4e98b317fc@mail.gmail.com>

On Tue, Jun 16, 2009 at 01:08:02PM +0200, Santi Béjar wrote:

Show 5 quoted lines

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

Fixing it would involve tweaks to remote_find_tracking, I think, but I haven't looked into it too closely.

I'm not sure of the impliciations of allowing non-qualified refs in that config. Will we detect and warn about ambiguities? Does it actually work with non-branches?

-Peff