diff: drop complete_rewrite parameter from run_external_diff()

peff · gitster · commit 4bc1792750ed · 2019-02-14T15:26:14.000-08:00
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 &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -4178,7 +4178,6 @@ static void run_external_diff(const char *pgm,`
`4178`	`4178`	`struct diff_filespec *one,`
`4179`	`4179`	`struct diff_filespec *two,`
`4180`	`4180`	`const char *xfrm_msg,`
`4181`		`- int complete_rewrite,`
`4182`	`4181`	`struct diff_options *o)`
`4183`	`4182`	`{`
`4184`	`4183`	`struct argv_array argv = ARGV_ARRAY_INIT;`
`@@ -4336,8 +4335,7 @@ static void run_diff_cmd(const char *pgm,`
`4336`	`4335`	`}`
`4337`	`4336`
`4338`	`4337`	`if (pgm) {`
`4339`		`- run_external_diff(pgm, name, other, one, two, xfrm_msg,`
`4340`		`- complete_rewrite, o);`
	`4338`	`+ run_external_diff(pgm, name, other, one, two, xfrm_msg, o);`
`4341`	`4339`	`return;`
`4342`	`4340`	`}`
`4343`	`4341`	`if (one && two)`