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

Re: [PATCH 9/9 v8] difftool: print list of valid tools with '--tool-help'

From
Tim Henigan <tim.henigan@gmail.com>
Date
Mar 28, 2012, 20:16 UTC
Message-ID
<CAFouetiCmmEZDN0ATYE8fQ=CFzA-F+DEWoe-uSNL6Hu_8__rJQ@mail.gmail.com>
In-Reply-To
<7v4nt8v6ip.fsf@alter.siamese.dyndns.org>
On Wed, Mar 28, 2012 at 4:02 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 8 quoted lines
>
> That is even worse, no?  Is the rest of the code prepared to give you "git
> difftool -t baz" in such a layout?  What if you have another baz next to
> foo and bar?
>
> What I was hinting at was that you may want to $File::Find::prune=1 when
> you find a subdirectory.  While at it, you may also want to replace
> the "unless -d $_" with "if -f $_ && -x _" or something.
I see now...sorry I missed your obvious point.  I will look into this further.
The script makes some assumptions right now:
  1) All tool config scripts must be located in "$(git --exec-path)/mergetools".
  2) There is only one tool config in each script
        - See my other other recent patch that splits vim/gvim [1]
  3) The name of the tool script matches the name of the tool itself.

Do these assumptions seem reasonable? If so, perhaps I should add a README to the mergetools directory that outlines these assumptions?

[1]: http://thread.gmane.org/gmane.comp.version-control.git/194179
Previous: Junio C Hamano
Message 5 of 5 in “difftool: print list of valid tools with '--tool-help'”
  1. 9/9 difftool: print list of valid tools with '--tool-help'Tim Henigan, Mar 28, 2012
  2. Junio C HamanoMar 28, 2012
  3. Tim HeniganMar 28, 2012
  4. Junio C HamanoMar 28, 2012
  5. Tim HeniganMar 28, 2012

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.