Merge branch 'th/diff-extra'

2006-08-12 19:34:41 -07:00
parent 647377c4c9 5faf64cd28
commit f3c5b39567
3 changed files with 13 additions and 14 deletions
--- a/builtin-diff-files.c
+++ b/builtin-diff-files.c
@ -47,12 +47,5 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
 	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);
 }