From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Jan Hudec <bulb@ucw.cz>,
git@vger.kernel.org, Theodore Ts'o <tytso@mit.edu>
Subject: Re: [RFC] git-mergetool: show original branch names when possible
Date: Tue, 21 Aug 2007 14:17:47 -0700 [thread overview]
Message-ID: <7vir78oadg.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20070821205503.GA16777@coredump.intra.peff.net> (Jeff King's message of "Tue, 21 Aug 2007 16:55:03 -0400")
Jeff King <peff@peff.net> writes:
> On Tue, Aug 21, 2007 at 04:59:43PM +0200, Jan Hudec wrote:
>
>> > 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.
Isn't the label "FETCH_HEAD" itself clear enough, without even
looking at it to see which commit it is?
prev parent reply other threads:[~2007-08-21 21:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-20 7:53 [RFC] git-mergetool: show original branch names when possible Jeff King
2007-08-20 8:28 ` Junio C Hamano
2007-08-20 8:52 ` Jeff King
2007-08-20 18:17 ` Jan Hudec
2007-08-21 6:10 ` Jeff King
2007-08-21 14:59 ` Jan Hudec
2007-08-21 20:55 ` Jeff King
2007-08-21 21:17 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vir78oadg.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=bulb@ucw.cz \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.