From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Matthew Groth <mgroth49@gmail.com>,
Samuel Lijin <sxlijin@gmail.com>
Subject: [PATCH v2] mergetools/meld: improve backwards-compatibiilty when using "--output"
Date: Sun, 18 Jun 2017 17:20:27 -0700 [thread overview]
Message-ID: <20170619002027.27346-1-davvid@gmail.com> (raw)
Meld 3.16.0 requires a "=" in the --output argument, as it uses
a simple hand-rolled command-line parser.
Newer versions of Meld (3.16.4, and possibly earlier) use
optparse, which accepts either "--output <file>" or
"--output=<file>".
Use "--output=<file>" for better compatibility.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
Changes since v1:
Fixed an "optpaarse" -> "optparse" typo in the commit message.
This patch is otherwise identical to v1.
mergetools/meld | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mergetools/meld b/mergetools/meld
index bc178e8882..7a08470f88 100644
--- a/mergetools/meld
+++ b/mergetools/meld
@@ -10,7 +10,7 @@ merge_cmd () {
if test "$meld_has_output_option" = true
then
- "$merge_tool_path" --output "$MERGED" \
+ "$merge_tool_path" --output="$MERGED" \
"$LOCAL" "$BASE" "$REMOTE"
else
"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
--
2.13.1.453.gc0395165f3
reply other threads:[~2017-06-19 0:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20170619002027.27346-1-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mgroth49@gmail.com \
--cc=sxlijin@gmail.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.