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>
This commit is contained in:
parent
19b9046eed
commit
4bc1792750
4
diff.c
4
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)
|
||||
|
Loading…
Reference in New Issue
Block a user