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

Getting the full path of a conflicting file within a custom merge driver?

From
GAGondek, Andreas <andreas.gondek@dwpbank.de>
Date
Jun 1, 2015, 15:46 UTC
Message-ID
<D8780C527EB1E642B3150E6D705B46D468837861@DWPWHMS531.dwpbank.local>
Hello,
I'm wondering if there is no option to find out the full path of a conflicting file from within a custom merge driver? If I understand this correctly, Git only provides the name of the 3 temporary local files and the size of the limiter. But is there any possibility to get the path of the file via a Git command, that I can run from within the merge driver? Maybe as part of the repository's status?
Thank you in advance.

Greetings, Andreas Gondek Applications ________________________________

Deutsche WertpapierService Bank AG
ITTAS
Derendorfer Allee 2
40476 Düsseldorf
Tel.: +49 69 5099 9503
Fax: +49 69 5099 85 9503
E-Mail: Andreas.Gondek@dwpbank.de
http://www.dwpbank.de
Deutsche WertpapierService Bank AG | Wildunger Straße 14 | 60487 Frankfurt am Main 
Sitz der AG: Frankfurt am Main, HRB 56913 | USt.-ID: DE 813759005 
Vorstand: Thomas Klanten, Dr. Christian Tonnesen
Aufsichtsrat: Wilfried Groos (Vors.)
Next: Junio C Hamano
Message 1 of 9 in “Getting the full path of a conflicting file within a custom merge driver?”
  1. Gondek, AndreasJun 1, 2015
  2. Junio C HamanoJun 1, 2015
  3. AW: Getting the full path of a conflicting file within a custom merge driver?Gondek, Andreas, Jun 2, 2015
  4. Junio C HamanoJun 2, 2015
  5. Re*: AW: Getting the full path of a conflicting file within a custom merge driver?Junio C Hamano, Jun 4, 2015
  6. AW: Re*: AW: Getting the full path of a conflicting file within a custom merge driver?Gondek, Andreas, Jun 5, 2015
  7. Christian CouderJun 5, 2015
  8. Christian CouderJun 5, 2015
  9. Junio C HamanoJun 5, 2015

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.