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] mergetools/meld: improve backwards-compatibiilty when using "--output"
Date: Sat, 17 Jun 2017 03:24:54 -0700 [thread overview]
Message-ID: <20170617102454.2040-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
optpaarse, which accepts either "--output <file>" or
"--output=<file>".
Use "--output=<file>" for better compatibility.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
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
next reply other threads:[~2017-06-17 10:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-17 10:24 David Aguilar [this message]
2017-06-17 14:11 ` [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output" Samuel Lijin
2017-06-18 7:46 ` David Aguilar
2017-06-18 9:11 ` Samuel Lijin
2017-06-19 0:17 ` David Aguilar
2017-06-19 1:01 ` Samuel Lijin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170617102454.2040-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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).