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

From: Jeff King <peff@peff.net>
Date: Aug 21, 2007, 06:10 UTC
Message-ID: <20070821061014.GB7323@coredump.intra.peff.net>
In-Reply-To: <20070820181725.GB8542@efreet.light.src>

On Mon, Aug 20, 2007 at 08:17:25PM +0200, Jan Hudec wrote:

Show 5 quoted lines

> > I think this is a failing of git-merge, though, for not including that
> > nice human-readable information. We can fix it with something like this:
> 
> Maybe you could call git-name-rev on it if it does not come with
> a human-readable name.

I considered that, but it has two drawbacks:

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

  2. In some circumstances, it can come up with counter-intuitive
     names. If more than one ref points to a given commit, then you can
     end up with something like "git-merge foo" telling you all about
     the merge conflicts with "bar". But perhaps that is too obscure a
     corner case to worry about.

-Peff