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

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

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 2, 2015, 17:47 UTC
Message-ID
<xmqq4mmq3sug.fsf@gitster.dls.corp.google.com>
In-Reply-To
<D8780C527EB1E642B3150E6D705B46D468837AA7@DWPWHMS531.dwpbank.local>
"Gondek, Andreas" <Andreas.Gondek@dwpbank.de> writes:
> thank you for responding this fast. I would suggest providing this
> information as an additional parameter (like %A %O %B and %L) maybe
> %P.

Yes, per-cent plus a letter is more in line with the way information is passed to the scripts already. Thanks for making a more sensible counter-suggestion. And your %P(ath) sounds like a sensible choice.

It won't be a two-liner, though, as the path is an arbitrary string, unlike the names of the three temporary files, and needs to be quoted for the shell.

Let me see if I can find time today to cook up something.
Previous: Gondek, AndreasNext: Junio C Hamano
Message 4 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.