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

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

From
EREric Raible <raible@nextest.com>
Date
Aug 31, 2010, 18:52 UTC
Message-ID
<4C7D4F63.2060307@nextest.com>
[Note: this is a resend - the initial attempt got no responses]
Hello All -

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.

As a workaround, I'm grepping for the git-hash-object of %A (aka "ours) from the output of "git ls-tree -r HEAD".

I've examined the environment, and saw nothing relevant. "git-ls-files -u" isn't useful, since the items aren't unmerged yet.

Can anyone offer hints/help/tips?
Thanks - Eric
git version 1.7.0.2.msysgit.0
Next: Jonathan Nieder
Message 1 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.