From: "Jakub Vrana" <jakub@vrana.cz>
To: <git@vger.kernel.org>
Cc: <gitster@pobox.com>
Subject: [PATCH] diff: respect --no-ext-diff with typechange
Date: Mon, 16 Jul 2012 17:27:00 -0700 [thread overview]
Message-ID: <000301cd63b2$e39a2130$aace6390$@vrana.cz> (raw)
If external diff is specified through diff.external then it is used even if
`git diff --no-ext-diff` is used when there is a typechange.
Signed-off-by: Jakub Vrana <jakub@vrana.cz>
---
diff.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/diff.c b/diff.c
index 208096f..898d610 100644
--- a/diff.c
+++ b/diff.c
@@ -3074,6 +3074,9 @@ static void run_diff(struct diff_filepair *p, struct
diff_options *o)
if (o->prefix_length)
strip_prefix(o->prefix_length, &name, &other);
+ if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL))
+ pgm = NULL;
+
if (DIFF_PAIR_UNMERGED(p)) {
run_diff_cmd(pgm, name, NULL, attr_path,
NULL, NULL, NULL, o, p);
--
1.7.10.msysgit.1
next reply other threads:[~2012-07-17 0:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-17 0:27 Jakub Vrana [this message]
2012-07-17 4:16 ` [PATCH] diff: respect --no-ext-diff with typechange Jeff King
2012-07-18 1:07 ` Jakub Vrana
2012-07-18 5:08 ` Junio C Hamano
2012-07-18 6:23 ` Jeff King
2012-07-18 7:06 ` Jeff King
2012-07-18 22:47 ` Junio C Hamano
2012-07-19 11:49 ` Jeff King
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='000301cd63b2$e39a2130$aace6390$@vrana.cz' \
--to=jakub@vrana.cz \
--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).