On Tue, Feb 04, 2014 at 02:49:16PM -0800, Junio C Hamano wrote:
> Let's tell these branches that they are both supposed to be building
> on top of 'master'.
>
> : gitster track/master; git config branch.foo.remote .
> : gitster track/master; git config branch.foo.merge refs/heads/master
> : gitster track/master; git config branch.bar.remote .
> : gitster track/master; git config branch.bar.merge master
>
> The difference between the two is that 'foo' spells the @{upstream}
> branch in full (which is the recommended practice), while 'bar' is
> loose and asks for 'master'.
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.
-Peff
[1] http://thread.gmane.org/gmane.comp.version-control.git/121671
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html