diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-13 04:34:41 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-13 04:34:41 +0200 |
| commit | f3c5b39567535a41a371aad8a6affbeea0d4c0b9 (patch) | |
| tree | c83f5d4be58e296f3eb90a4be13782d48e5713ad /builtin-diff.c | |
| parent | Merge branch 'jc/pack-objects' (diff) | |
| parent | Remove awkward compatibility warts (diff) | |
| download | git-f3c5b39567535a41a371aad8a6affbeea0d4c0b9.tar.xz git-f3c5b39567535a41a371aad8a6affbeea0d4c0b9.zip | |
Merge branch 'th/diff-extra'
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 a090e298a5..82afce782d 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); } |