summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2019-02-14 05:49:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-02-14 23:26:14 (GMT)
commit4bc1792750ede6b716c0c099c690bbf77ddea6bc (patch)
treee1b4a9af91a8586e0e1d7d11895d06b1b8978dfb
parent19b9046eedef2c8b39a1192bfcb0541f59acde09 (diff)
downloadgit-4bc1792750ede6b716c0c099c690bbf77ddea6bc.zip
git-4bc1792750ede6b716c0c099c690bbf77ddea6bc.tar.gz
git-4bc1792750ede6b716c0c099c690bbf77ddea6bc.tar.bz2
diff: drop complete_rewrite parameter from run_external_diff()
Our builtin_diff() wants to know whether break-detection found a complete rewrite, because it changes how the diff is shown. However, when calling out to an external diff, we don't pass this information along (and doing so would require designing a new interface to the user-provided program). Let's drop the unused parameter to make this fact more clear. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--diff.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/diff.c b/diff.c
index d24843b..e3f2637 100644
--- a/diff.c
+++ b/diff.c
@@ -4178,7 +4178,6 @@ static void run_external_diff(const char *pgm,
struct diff_filespec *one,
struct diff_filespec *two,
const char *xfrm_msg,
- int complete_rewrite,
struct diff_options *o)
{
struct argv_array argv = ARGV_ARRAY_INIT;
@@ -4336,8 +4335,7 @@ static void run_diff_cmd(const char *pgm,
}
if (pgm) {
- run_external_diff(pgm, name, other, one, two, xfrm_msg,
- complete_rewrite, o);
+ run_external_diff(pgm, name, other, one, two, xfrm_msg, o);
return;
}
if (one && two)