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

Re: [PATCH 6/7] mergetools: Fix difftool/mergetool --tool-help listing for vim

From
John Keeping <john@keeping.me.uk>
Date
Jan 25, 2013, 10:38 UTC
Message-ID
<20130125103845.GX7498@serenity.lan>
In-Reply-To
<1359107034-14606-7-git-send-email-davvid@gmail.com>
On Fri, Jan 25, 2013 at 01:43:53AM -0800, David Aguilar wrote:
> "git difftool --tool-help" and "git mergetool --tool-help" incorreclty
> list "vim" as being an unavailable tool.  This is because they attempt
> to find a tool named according to the mergetool scriptlet instead of the Git-
> recognized tool name.

Actually, after my patches both git-difftool and git-mergetool get this right since list_merge_tool_candidates lists vimdiff and gvimdiff.

Show 6 quoted lines
> vimdiff, vimdiff2, gvimdiff, and gvimdiff2 are all provided by the "vim"
> scriptlet.  This required git-mergetool--lib to special-case it when
> setting up the tool.
> 
> Remove the exception for "vim" and allow the scriptlets to be found
> naturally by using symlinks to a single "vimdiff" scriptlet.

I wonder if it would be better to make these single-line scripts instead of symlinks:

    . "$MERGE_TOOLS_DIR"/vimdiff
where we make git-mergetool--lib.sh export:
    MERGE_TOOLS_DIR=$(git --exec-path)/mergetools
John
Previous: Sebastian SchuberthNext: David Aguilar
Message 12 of 30 in “mergetool-lib improvements for --tool-help”
  1. 0/7 mergetool-lib improvements for --tool-helpDavid Aguilar, Jan 25, 2013
  2. 1/7 git-mergetool: move show_tool_help to mergetool--libDavid Aguilar, Jan 25, 2013
  3. 2/7 git-mergetool: remove redundant assignmentDavid Aguilar, Jan 25, 2013
  4. 3/7 git-mergetool: don't hardcode 'mergetool' in show_tool_helpDavid Aguilar, Jan 25, 2013
  5. 4/7 git-difftool: use git-mergetool--lib for "--tool-help"David Aguilar, Jan 25, 2013
  6. 5/7 mergetools/vim: Remove redundant diff commandDavid Aguilar, Jan 25, 2013
  7. 6/7 mergetools: Fix difftool/mergetool --tool-help listing for vimDavid Aguilar, Jan 25, 2013
  8. Sebastian SchuberthJan 25, 2013
  9. David AguilarJan 25, 2013
  10. Sebastian SchuberthJan 25, 2013
  11. Sebastian SchuberthJan 25, 2013
  12. John KeepingJan 25, 2013
  13. David AguilarJan 25, 2013
  14. Junio C HamanoJan 25, 2013
  15. 7/7 mergetool--lib: Improve show_tool_help() outputDavid Aguilar, Jan 25, 2013
  16. John KeepingJan 25, 2013
  17. Junio C HamanoJan 25, 2013
  18. John KeepingJan 25, 2013
  19. Junio C HamanoJan 25, 2013
  20. John KeepingJan 25, 2013
  21. Junio C HamanoJan 25, 2013
  22. John KeepingJan 25, 2013
  23. Junio C HamanoJan 25, 2013
  24. John KeepingJan 25, 2013
  25. 8/7 mergetool--lib: don't call "exit" in setup_toolJohn Keeping, Jan 25, 2013
  26. Junio C HamanoJan 26, 2013
  27. David AguilarJan 26, 2013
  28. 1/2 mergetool--lib: don't call "exit" in setup_toolJohn Keeping, Jan 26, 2013
  29. 1/2 mergetool--lib: don't call "exit" in setup_toolJohn Keeping, Jan 26, 2013
  30. 9/7 mergetool--lib: fix path lookup in guess_merge_toolJohn Keeping, Jan 25, 2013

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.