aboutsummaryrefslogtreecommitdiff
path: root/builtin-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-12 19:34:41 -0700
committerJunio C Hamano <junkio@cox.net>2006-08-12 19:34:41 -0700
commitf3c5b39567535a41a371aad8a6affbeea0d4c0b9 (patch)
treec83f5d4be58e296f3eb90a4be13782d48e5713ad /builtin-diff.c
parent647377c4c91064fc5001acddd5357467c0da6ef9 (diff)
parent5faf64cd28bf79f0c2939717d2ba117498717059 (diff)
downloadgit-f3c5b39567535a41a371aad8a6affbeea0d4c0b9.tar.gz
git-f3c5b39567535a41a371aad8a6affbeea0d4c0b9.tar.xz
Merge branch 'th/diff-extra'
Diffstat (limited to 'builtin-diff.c')
-rw-r--r--builtin-diff.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/builtin-diff.c b/builtin-diff.c
index a090e298a..82afce782 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);
}