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

Re: [RFC/PATCH] Teach git mergetool to use custom commands defined at config time

From
Theodore Tso <tytso@mit.edu>
Date
Feb 17, 2008, 21:49 UTC
Message-ID
<20080217214942.GJ8905@mit.edu>
In-Reply-To
<FBA2E61E-5CAF-49E3-A917-ACDD10586928@zib.de>
On Sun, Feb 17, 2008 at 08:59:31AM +0100, Steffen Prohaska wrote:
Show 8 quoted lines
>
> I am not upset at all and I really appreciate Charles work for
> adding a generic mechanism.  I was just wondering why not taking
> the direct way of adding tools to git-mergetool one by one until
> we eventually have a rather complete list of supported tools.
> This would be the easiest solution for end users if their
> preferred tool is supported.  It is also easier to add support
> for a specific tool than a generic mechanism.

I have no objection to a generic mechanism, but I don't see the value of Charles suggestion to rip out support for the existing tools supported by git-mergetool.

I think it *would* be better to use %(foo) extrapolation that environment variables, so that it's not required for users to write shell scripts unless absolutely necessary.

When we get around to rewriting git-mergetool in C, it might make sense to put the tool support in the various shell scripts that are installed in the git helper binary directory (i.e., git-mergetool-kdiff3, git-mergetool-meld, etc.) That would make it easier for users to create new shell scripts to support new tools if necessary.

					- Ted
Previous: Charles BaileyNext: Charles Bailey
Message 12 of 16 in “Teach git mergetool to use custom commands defined at config time”
  1. Teach git mergetool to use custom commands defined at config timeCharles Bailey, Feb 16, 2008
  2. Junio C HamanoFeb 16, 2008
  3. Charles BaileyFeb 16, 2008
  4. Jakub NarebskiFeb 16, 2008
  5. Steffen ProhaskaFeb 16, 2008
  6. Charles BaileyFeb 17, 2008
  7. Johannes SchindelinFeb 17, 2008
  8. Charles BaileyFeb 17, 2008
  9. Junio C HamanoFeb 17, 2008
  10. Steffen ProhaskaFeb 17, 2008
  11. Charles BaileyFeb 17, 2008
  12. Theodore TsoFeb 17, 2008
  13. Charles BaileyFeb 17, 2008
  14. Charles BaileyFeb 17, 2008
  15. Junio C HamanoFeb 18, 2008
  16. Charles BaileyFeb 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.