diff options
| author | Timo Hirvonen <tihirvon@gmail.com> | 2006-06-24 17:28:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-02 05:26:00 (GMT) |
| commit | 5faf64cd28bf79f0c2939717d2ba117498717059 (patch) | |
| tree | 858e15f43c95e338e3e9bdc5b80c09354bae8bd9 /builtin-diff.c | |
| parent | d7de00f7e0d2374cb7933d2ee1ebe5273a8acf53 (diff) | |
| download | git-5faf64cd28bf79f0c2939717d2ba117498717059.zip git-5faf64cd28bf79f0c2939717d2ba117498717059.tar.gz git-5faf64cd28bf79f0c2939717d2ba117498717059.tar.bz2 | |
Remove awkward compatibility warts
Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-diff.c')
| -rw-r--r-- | builtin-diff.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/builtin-diff.c b/builtin-diff.c index d520c7c..059eb6d 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -56,13 +56,6 @@ static int builtin_diff_files(struct rev_info *revs, if (revs->max_count < 0 && (revs->diffopt.output_format & DIFF_FORMAT_PATCH)) 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); } |