Remove awkward compatibility warts

diff --git a/builtin-diff-files.c b/builtin-diff-files.c
index cebda828eec4e90f3d0af050e07a53071b39d5b7..3361898ada6f6606293e9bf8e1ed1539dff41a8d 100644 (file)
--- a/builtin-diff-files.c
+++ b/builtin-diff-files.c
@@ -36,20 +36,16 @@ int cmd_diff_files(int argc, const char **argv, char **envp)
                        usage(diff_files_usage);
                argv++; argc--;
        }
+       if (!rev.diffopt.output_format)
+               rev.diffopt.output_format = DIFF_FORMAT_RAW;
+
        /*
         * Make sure there are NO revision (i.e. pending object) parameter,
         * rev.max_count is reasonable (0 <= n <= 3),
         * there is no other revision filtering parameters.
         */
-       if (rev.pending_objects ||
+       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);
 }