All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Raible <raible@nextest.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: RFH: is the current file available to a custom merge driver?
Date: Tue, 31 Aug 2010 12:07:40 -0700	[thread overview]
Message-ID: <4C7D52FC.8000701@nextest.com> (raw)
In-Reply-To: <20100831185708.GS2315@burratino>

On 8/31/2010 11:57 AM, Jonathan Nieder wrote:
> Hi Eric,
> 
> Eric Raible wrote:
> 
>> In writing a custom merge driver to support $dayjob
>> requirements I've failed to find a simple way of getting
>> the current file name that the driver is supposed to
>> be merging.
>>
>> I of course have the "ancestor", "ours", and "theirs"
>> temporary files, but for Ui purposes I'd like to know
>> the filename as well.
> 
> It's not available.  You can try modifying ll-merge.c to
> expose it if you have an idea about how that should work.
> .

Thanks Jonathan for the (very!) quick response, but since
time is short I think I'll stick with my current technique
(grepping $(git ls-tree -r HEAD) for $(git hash-object %A))

  reply	other threads:[~2010-08-31 19:07 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-31 18:52 RFH: is the current file available to a custom merge driver? Eric Raible
2010-08-31 18:57 ` Jonathan Nieder
2010-08-31 19:07   ` Eric Raible [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-08-26 22:13 Eric Raible

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=4C7D52FC.8000701@nextest.com \
    --to=raible@nextest.com \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    /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.