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

Re: [PATCH] mergetool: export variables for use by custom mergetools

From
Charles Bailey <charles@hashpling.org>
Date
May 18, 2008, 00:07 UTC
Message-ID
<20080518000739.GA29689@hashpling.org>
In-Reply-To
<b6840c770805171655y691fbd0vd2d65d0914757b63@mail.gmail.com>
On Sun, May 18, 2008 at 02:55:10AM +0300, Evgeny wrote:
> Ohh, so the documentation is not clear then.

That's a pity, I did make an effort with the documentation, but explaining things is not my strongest ability.

Show 8 quoted lines
> 
> [mergetool "p4merge"]
> 	cmd = p4merge.sh "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED"
> 	keepBackup = false
> 
> [merge]
> 	tool = p4merge
>

"$PWD/" looks very wrong. Perhaps p4merge.sh is changing its working directory and not handling the passed paths correctly?

> Thanks for the explanation!
> I believe that an example in the documentation could be a nice
> addition, to clear things up in the future.

Yes, there were a few examples in the original patch mail text (note that 'path' has sinces changed to 'MERGED'), but they never made it to the documentation. There's also some discussion about eval vs. leaking environment variables:

http://thread.gmane.org/gmane.comp.version-control.git/74059
-- 
Charles Bailey
http://ccgi.hashpling.plus.com/blog/
Previous: EvgenyNext: Evgeny
Message 4 of 5 in “mergetool: export variables for use by custom mergetools”
  1. mergetool: export variables for use by custom mergetoolsDavid Aguilar, May 17, 2008
  2. Charles BaileyMay 17, 2008
  3. EvgenyMay 17, 2008
  4. Charles BaileyMay 18, 2008
  5. EvgenyMay 18, 2008

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.