[PATCH] Do not include unused header files.

diff --git a/diff-files.c b/diff-files.c
index c9c914be144acedb47abd0bfa580f102911dd56a..8ab7915977dc2a97fa49ad813a89c676c7208915 100644 (file)
--- a/diff-files.c
+++ b/diff-files.c
@@ -14,6 +14,7 @@ static int detect_rename = 0;
 static int diff_setup_opt = 0;
 static int diff_score_opt = 0;
 static const char *pickaxe = NULL;
+static int pickaxe_opts = 0;
 static int silent = 0;
 
 static void show_unmerge(const char *path)
@@ -52,8 +53,10 @@ int main(int argc, const char **argv)
                        diff_output_format = DIFF_FORMAT_MACHINE;
                else if (!strcmp(argv[1], "-R"))
                        diff_setup_opt |= DIFF_SETUP_REVERSE;
-               else if (!strcmp(argv[1], "-S"))
+               else if (!strncmp(argv[1], "-S", 2))
                        pickaxe = argv[1] + 2;
+               else if (!strcmp(argv[1], "--pickaxe-all"))
+                       pickaxe_opts = DIFF_PICKAXE_ALL;
                else if (!strncmp(argv[1], "-M", 2)) {
                        diff_score_opt = diff_scoreopt_parse(argv[1]);
                        detect_rename = DIFF_DETECT_RENAME;
@@ -113,12 +116,12 @@ int main(int argc, const char **argv)
                show_modified(oldmode, mode, ce->sha1, null_sha1,
                              ce->name);
        }
+       if (1 < argc)
+               diffcore_pathspec(argv + 1);
        if (detect_rename)
                diffcore_rename(detect_rename, diff_score_opt);
        if (pickaxe)
-               diffcore_pickaxe(pickaxe);
-       if (1 < argc)
-               diffcore_pathspec(argv + 1);
+               diffcore_pickaxe(pickaxe, pickaxe_opts);
        diff_flush(diff_output_format, 1);
        return 0;
 }