Re: [RFC] git-mergetool: show original branch names when possible

From: Jeff King <peff@peff.net>
Date: Aug 21, 2007, 20:55 UTC
Message-ID: <20070821205503.GA16777@coredump.intra.peff.net>
In-Reply-To: <20070821145943.GI8542@efreet.light.src>

On Tue, Aug 21, 2007 at 04:59:43PM +0200, Jan Hudec wrote:

Show 6 quoted lines

> >   1. It does not handle pulls which have no tracking branch (the only
> >      ref we have is FETCH_HEAD, which is not a useful name :) ).
> 
> If there's no useful name, than it's probably hard to do anything at all
> about it. Though FETCH_HEAD is not all that useless -- it at least says it is
> that that you pull.

But there _is_ a useful name, it's just not a ref (it's the information from FETCH_HEAD "branch 'foo' of git://..."). In this case, git-mergetool could pull it out of FETCH_HEAD, as well, but I feel like we're starting to make a lot of fragile cross-tool assumptions.

> I meant it as a fallback, for cases where it for some reason can't be
> recorded or is not recorded. Recording it is obviously better.

Right, in which case I think we should just be more complete about recording it.

-Peff