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 v2 1/4] mergetool--lib: Simplify command expressions
Date: Tue, 29 Jan 2013 19:22:04 +0000 [thread overview]
Message-ID: <20130129192204.GC1342@serenity.lan> (raw)
In-Reply-To: <1359334346-5879-2-git-send-email-davvid@gmail.com>
On Sun, Jan 27, 2013 at 04:52:23PM -0800, David Aguilar wrote:
> Update variable assignments to always use $(command "$arg")
> in their RHS instead of "$(command "$arg")" as the latter
> is harder to read. Make get_merge_tool_cmd() simpler by
> avoiding "echo" and $(command) substitutions completely.
>
> Signed-off-by: David Aguilar <davvid@gmail.com>
> ---
> @@ -300,9 +292,9 @@ get_merge_tool_path () {
> fi
> if test -z "$merge_tool_path"
> then
> - merge_tool_path="$(translate_merge_tool_path "$merge_tool")"
> + merge_tool_path=$(translate_merge_tool_path "$merge_tool")
> fi
> - if test -z "$(get_merge_tool_cmd "$merge_tool")" &&
> + if test -z $(get_merge_tool_cmd "$merge_tool") &&
This change should be reverted to avoid calling "test -z" without any
other arguments, as Johannes pointed out in v1.
The rest of this patch looks good to me.
> ! type "$merge_tool_path" >/dev/null 2>&1
> then
> echo >&2 "The $TOOL_MODE tool $merge_tool is not available as"\
next prev parent reply other threads:[~2013-01-29 19:22 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
2013-01-29 19:22 ` John Keeping [this message]
2013-01-29 22:09 ` [PATCH v2 1/4] mergetool--lib: Simplify command expressions 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=20130129192204.GC1342@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).