@matheusbsbs / matheus-bagliano / commits / 5faf64cd28
Fork 0

Remove awkward compatibility warts

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Timo Hirvonen committed Jun 24, 2006 at 20:28 UTC 5faf64cd28bf79f0c2939717d2ba117498717059
2 files changed -14
builtin-diff-files.c
-7
@@ -47,12 +47,5 @@ int cmd_diff_files(int argc, const char **argv, char **envp)
47 if (rev.pending.nr ||
48 rev.min_age != -1 || rev.max_age != -1)
49 usage(diff_files_usage);
50 - /*
51 - * Backward compatibility wart - "diff-files -s" used to
52 - * defeat the common diff option "-s" which asked for
53 - * DIFF_FORMAT_NO_OUTPUT.
54 - */
55 - if (rev.diffopt.output_format == DIFF_FORMAT_NO_OUTPUT)
56 - rev.diffopt.output_format = DIFF_FORMAT_RAW;
50 return run_diff_files(&rev, silent);
51 }
builtin-diff.c
-7
@@ -56,13 +56,6 @@ static int builtin_diff_files(struct rev_info *revs,
56 if (revs->max_count < 0 &&
57 (revs->diffopt.output_format & DIFF_FORMAT_PATCH))
58 revs->combine_merges = revs->dense_combined_merges = 1;
59 - /*
60 - * Backward compatibility wart - "diff-files -s" used to
61 - * defeat the common diff option "-s" which asked for
62 - * DIFF_FORMAT_NO_OUTPUT.
63 - */
64 - if (revs->diffopt.output_format == DIFF_FORMAT_NO_OUTPUT)
65 - revs->diffopt.output_format = DIFF_FORMAT_RAW;
59 return run_diff_files(revs, silent);
60 }
61