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

Re: [QUESTION] mergetool environment variables

From
Johannes Sixt <j6t@kdbg.org>
Date
Sep 13, 2025, 07:04 UTC
Message-ID
<a5e01f0f-1789-427c-83c3-90644fa234c9@kdbg.org>
In-Reply-To
<074901dc2422$2039a910$60acfb30$@nexbridge.com>
Am 12.09.25 um 22:16 schrieb rsbecker@nexbridge.com:
Show 8 quoted lines
> I am trying to integrate a custom mergetool with a shell wrapper.
> What I get from the online help is the following description referring
> to the command and environment variables.
> 
> mergetool.<tool>.cmd 
> Specify the command to invoke the specified merge tool.
> The specified command is evaluated in shell with the
> following variables available: BASE is the name of a
Take note: this talks about "variables", not "environment variables".
Show 16 quoted lines
> temporary file containing the common base of the files
> to be merged, if available; LOCAL is the name of a
> temporary file containing the contents of the file on
> the current branch; REMOTE is the name of a temporary
> file containing the contents of the file from the branch
> being merged; MERGED contains the name of the file
> to which the merge tool should write the results of a
> successful merge.
> 
> When I try to use this from a shell, simply with:
> #!/bin/sh
> env
> exit 1
> 
> the described environment variables: BASE, LOCAL,
> REMOTE, and MERGED, are not present.

Look at the scripts in the directory mergetools/ and note that they are only (large) shell code fragements without a shbang line. They are not even executable.

-- Hannes
Previous: rsbecker@nexbridge.comNext: rsbecker@nexbridge.com
Message 2 of 8 in “[QUESTION] mergetool environment variables”
  1. rsbecker@nexbridge.comSep 12, 2025
  2. Johannes SixtSep 13, 2025
  3. rsbecker@nexbridge.comSep 13, 2025
  4. Johannes SixtSep 13, 2025
  5. rsbecker@nexbridge.comSep 14, 2025
  6. Junio C HamanoSep 14, 2025
  7. Phillip WoodSep 14, 2025
  8. D. Ben KnobleSep 15, 2025

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.