From: John Keeping <john@keeping.me.uk>
To: David Aguilar <davvid@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 3/4] mergetool--lib: Add functions for finding available tools
Date: Tue, 29 Jan 2013 23:02:38 +0000 [thread overview]
Message-ID: <20130129230238.GF1342@serenity.lan> (raw)
In-Reply-To: <CAJDDKr4e=pg=YJ4CfUk7guUCcikBtXTveVX9j6CV5NtGvPB=9Q@mail.gmail.com>
On Tue, Jan 29, 2013 at 02:27:21PM -0800, David Aguilar wrote:
> I don't want to stomp on your feet and poke at this file too much if
> you're planning on building on top of it (I already did a few times
> ;-). My git time is a bit limited for the next few days so I don't
> want to hold you up. I can help shepherd through small fixups that
> come up until the weekend rolls around and I have more time, but I
> also don't want to hold you back until then.
>
> I will have some time tonight. If you guys would prefer an
> incremental patch I can send one that changes the "ls" expression and
> the way the unavailable block is structured. Otherwise, I can send
> replacements to handle the "test -z" thing, $TAB$TAB, and the
> simplification of the unavailable block.
>
> Later patches (that are working towards the new feature) can
> generalize show_tool_names() further and eliminate the need for the
> available/unavailable variables altogether. John, I would imagine
> that you'd want to pick that up since you're driving towards having
> --tool-help honor custom tools.
>
> What do you think?
I was planning to hold off until this series is in a reasonable state -
there's no rush as far as I'm concerned, but if Junio's happy to leave
these patches with just the small fixups I'm happy to build on that with
a patch that removes the available and unavailable variables before
adding the tools from git-config.
John
next prev parent reply other threads:[~2013-01-29 23:03 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-28 0:52 [PATCH v2 0/4] Auto-generate mergetool lists David Aguilar
2013-01-28 0:52 ` [PATCH v2 1/4] mergetool--lib: Simplify command expressions David Aguilar
2013-01-28 0:52 ` [PATCH v2 2/4] mergetool--lib: Improve the help text in guess_merge_tool() David Aguilar
2013-01-28 0:52 ` [PATCH v2 3/4] mergetool--lib: Add functions for finding available tools David Aguilar
2013-01-28 0:52 ` [PATCH v2 4/4] doc: Generate a list of valid merge tools David Aguilar
2013-01-28 2:14 ` Junio C Hamano
2013-01-28 19:37 ` [PATCH v2 3/4] mergetool--lib: Add functions for finding available tools John Keeping
2013-01-28 20:36 ` Junio C Hamano
2013-01-29 19:48 ` John Keeping
2013-01-29 20:22 ` Junio C Hamano
2013-01-29 22:27 ` David Aguilar
2013-01-29 22:55 ` Junio C Hamano
2013-01-29 23:06 ` John Keeping
2013-01-30 3:08 ` Junio C Hamano
2013-01-30 3:34 ` Junio C Hamano
2013-01-29 23:02 ` John Keeping [this message]
2013-01-29 19:22 ` [PATCH v2 1/4] mergetool--lib: Simplify command expressions John Keeping
2013-01-29 22:09 ` David Aguilar
2013-01-29 22:27 ` Junio C Hamano
2013-01-30 6:20 ` [PATCH v3 1/4] mergetool--lib: simplify " David Aguilar
2013-01-30 7:04 ` Junio C Hamano
2013-01-28 2:08 ` [PATCH v2 0/4] Auto-generate mergetool lists Junio C Hamano
2013-01-28 2:21 ` David Aguilar
2013-01-28 2:27 ` Junio C Hamano
2013-01-28 2:41 ` David Aguilar
2013-01-28 2:53 ` Junio C Hamano
2013-01-28 21:01 ` John Keeping
2013-01-28 21:50 ` Junio C Hamano
2013-01-28 22:21 ` John Keeping
2013-01-29 11:56 ` Joachim Schmitz
2013-01-29 12:09 ` John Keeping
2013-01-29 16:15 ` Junio C Hamano
2013-01-29 16:46 ` John Keeping
2013-01-28 8:20 ` Philip Oakley
2013-01-28 9:16 ` David Aguilar
2013-01-28 21:19 ` Philip Oakley
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=20130129230238.GF1342@serenity.lan \
--to=john@keeping.me.uk \
--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).