From: John Keeping <john@keeping.me.uk>
To: David Aguilar <davvid@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH 3/4] mergetool--lib: Add functions for finding available tools
Date: Sun, 27 Jan 2013 23:04:04 +0000 [thread overview]
Message-ID: <20130127230404.GX7498@serenity.lan> (raw)
In-Reply-To: <1359321886-80523-4-git-send-email-davvid@gmail.com>
On Sun, Jan 27, 2013 at 01:24:45PM -0800, David Aguilar wrote:
> +filter_tools () {
> + filter="$1"
> + prefix="$2"
> + (
> + cd "$MERGE_TOOLS_DIR" &&
> + for i in *
> + do
> + echo "$i"
> + done
> + ) | sort | while read tool
> + do
> + setup_tool "$tool" 2>/dev/null &&
> + (eval "$filter" "$tool") &&
> + printf "$prefix$tool\n"
> + done
> +}
Can we change this so that it does this:
filter_tools () {
filter="$1"
(
cd "$MERGE_TOOLS_DIR" &&
for i in *
do
echo "$i"
done
) |
while read tool
do
setup_tool "$tool" 2>/dev/null &&
(eval "$filter" "$tool") &&
echo "$tool"
done
}
and keep the sorting and prefix in show_tool_help? This will make it
easier to integrate the user-configured tools from git-config.
John
next prev parent reply other threads:[~2013-01-27 23:04 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-27 21:24 [PATCH 0/4] Documentation: Auto-generate merge tool lists David Aguilar
2013-01-27 21:24 ` [PATCH 1/4] mergetool--lib: Simplify command expressions David Aguilar
2013-01-27 22:08 ` Johannes Sixt
2013-01-27 22:18 ` David Aguilar
2013-01-27 22:32 ` Junio C Hamano
2013-01-27 22:21 ` Junio C Hamano
2013-01-27 21:24 ` [PATCH 2/4] mergetool--lib: Improve the help text in guess_merge_tool() David Aguilar
2013-01-27 23:12 ` Junio C Hamano
2013-01-27 21:24 ` [PATCH 3/4] mergetool--lib: Add functions for finding available tools David Aguilar
2013-01-27 22:26 ` Johannes Sixt
2013-01-27 22:31 ` Junio C Hamano
2013-01-27 23:04 ` John Keeping [this message]
2013-01-27 23:32 ` Junio C Hamano
2013-01-27 23:45 ` David Aguilar
2013-01-27 21:24 ` [PATCH 4/4] doc: Generate a list of valid merge tools David Aguilar
2013-01-27 22:36 ` Junio C Hamano
2013-01-27 22:54 ` John Keeping
2013-01-27 23:46 ` Junio C Hamano
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=20130127230404.GX7498@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.