mirror of
https://github.com/git/git
synced 2024-08-28 03:59:25 +00:00
Remove awkward compatibility warts
Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
d7de00f7e0
commit
5faf64cd28
|
@ -47,12 +47,5 @@ int cmd_diff_files(int argc, const char **argv, char **envp)
|
||||||
if (rev.pending.nr ||
|
if (rev.pending.nr ||
|
||||||
rev.min_age != -1 || rev.max_age != -1)
|
rev.min_age != -1 || rev.max_age != -1)
|
||||||
usage(diff_files_usage);
|
usage(diff_files_usage);
|
||||||
/*
|
|
||||||
* Backward compatibility wart - "diff-files -s" used to
|
|
||||||
* defeat the common diff option "-s" which asked for
|
|
||||||
* DIFF_FORMAT_NO_OUTPUT.
|
|
||||||
*/
|
|
||||||
if (rev.diffopt.output_format == DIFF_FORMAT_NO_OUTPUT)
|
|
||||||
rev.diffopt.output_format = DIFF_FORMAT_RAW;
|
|
||||||
return run_diff_files(&rev, silent);
|
return run_diff_files(&rev, silent);
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,13 +56,6 @@ static int builtin_diff_files(struct rev_info *revs,
|
||||||
if (revs->max_count < 0 &&
|
if (revs->max_count < 0 &&
|
||||||
(revs->diffopt.output_format & DIFF_FORMAT_PATCH))
|
(revs->diffopt.output_format & DIFF_FORMAT_PATCH))
|
||||||
revs->combine_merges = revs->dense_combined_merges = 1;
|
revs->combine_merges = revs->dense_combined_merges = 1;
|
||||||
/*
|
|
||||||
* Backward compatibility wart - "diff-files -s" used to
|
|
||||||
* defeat the common diff option "-s" which asked for
|
|
||||||
* DIFF_FORMAT_NO_OUTPUT.
|
|
||||||
*/
|
|
||||||
if (revs->diffopt.output_format == DIFF_FORMAT_NO_OUTPUT)
|
|
||||||
revs->diffopt.output_format = DIFF_FORMAT_RAW;
|
|
||||||
return run_diff_files(revs, silent);
|
return run_diff_files(revs, silent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue