git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: RFH: is the current file available to a custom merge driver?

From
EREric Raible <raible@nextest.com>
Date
Aug 31, 2010, 19:07 UTC
Message-ID
<4C7D52FC.8000701@nextest.com>
In-Reply-To
<20100831185708.GS2315@burratino>
On 8/31/2010 11:57 AM, Jonathan Nieder wrote:
Show 16 quoted lines
> 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))

Previous: Jonathan Nieder
Message 3 of 3 in “RFH: is the current file available to a custom merge driver?”
  1. Eric RaibleAug 31, 2010
  2. Jonathan NiederAug 31, 2010
  3. Eric RaibleAug 31, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.