From: Tim Henigan <tim.henigan@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, davvid@gmail.com
Subject: Re: [PATCH 9/9 v8] difftool: print list of valid tools with '--tool-help'
Date: Wed, 28 Mar 2012 16:16:46 -0400 [thread overview]
Message-ID: <CAFouetiCmmEZDN0ATYE8fQ=CFzA-F+DEWoe-uSNL6Hu_8__rJQ@mail.gmail.com> (raw)
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:
>
> 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
prev parent reply other threads:[~2012-03-28 20:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-28 18:34 [PATCH 9/9 v8] difftool: print list of valid tools with '--tool-help' Tim Henigan
2012-03-28 18:58 ` Junio C Hamano
2012-03-28 19:48 ` Tim Henigan
2012-03-28 20:02 ` Junio C Hamano
2012-03-28 20:16 ` Tim Henigan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAFouetiCmmEZDN0ATYE8fQ=CFzA-F+DEWoe-uSNL6Hu_8__rJQ@mail.gmail.com' \
--to=tim.henigan@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).