diff options
| author | Timo Hirvonen <tihirvon@gmail.com> | 2006-06-24 20:28:42 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-01 22:26:00 -0700 |
| commit | 5faf64cd28bf79f0c2939717d2ba117498717059 (patch) | |
| tree | 858e15f43c95e338e3e9bdc5b80c09354bae8bd9 | |
| parent | d7de00f7e0d2374cb7933d2ee1ebe5273a8acf53 (diff) | |
| download | git-5faf64cd28bf79f0c2939717d2ba117498717059.tar.gz | |
Remove awkward compatibility warts
Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | builtin-diff-files.c | 7 | ||||
| -rw-r--r-- | builtin-diff.c | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/builtin-diff-files.c b/builtin-diff-files.c index a655eea91e..3361898ada 100644 --- a/builtin-diff-files.c +++ b/builtin-diff-files.c @@ -47,12 +47,5 @@ int cmd_diff_files(int argc, const char **argv, char **envp) if (rev.pending.nr || rev.min_age != -1 || rev.max_age != -1) 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); } diff --git a/builtin-diff.c b/builtin-diff.c index d520c7ca29..059eb6de49 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); } |