Really ignore generated distribution material.

diff --git a/diff-files.c b/diff-files.c
index 6d2aec34067071894f8e6abc5a94fb7415bc328f..89eb29b3e26678a294353ec4b6f52ca3285c7adc 100644 (file)
--- a/diff-files.c
+++ b/diff-files.c
@@ -6,10 +6,13 @@
 #include "cache.h"
 #include "diff.h"
 
-static const char *diff_files_usage =
-"git-diff-files [-p] [-q] [-r] [-z] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O<orderfile>] [-S<string>] [--pickaxe-all] [<path>...]";
+static const char diff_files_usage[] =
+"git-diff-files [-q] "
+"[<common diff options>] [<path>...]"
+COMMON_DIFF_OPTIONS_HELP;
 
-static int diff_output_format = DIFF_FORMAT_HUMAN;
+static int diff_output_format = DIFF_FORMAT_RAW;
+static int diff_line_termination = '\n';
 static int detect_rename = 0;
 static int find_copies_harder = 0;
 static int diff_setup_opt = 0;
@@ -38,11 +41,12 @@ static void show_modified(int oldmode, int mode,
        diff_change(oldmode, mode, old_sha1, sha1, path, NULL);
 }
 
-int main(int argc, const char **argv)
+int main(int argc, char **argv)
 {
        static const unsigned char null_sha1[20] = { 0, };
-       int entries = read_cache();
-       int i;
+       const char **pathspec;
+       const char *prefix = setup_git_directory();
+       int entries, i;
 
        while (1 < argc && argv[1][0] == '-') {
                if (!strcmp(argv[1], "-p") || !strcmp(argv[1], "-u"))
@@ -54,11 +58,9 @@ int main(int argc, const char **argv)
                else if (!strcmp(argv[1], "-s"))
                        ; /* no-op */
                else if (!strcmp(argv[1], "-z"))
-                       diff_output_format = DIFF_FORMAT_MACHINE;
+                       diff_line_termination = 0;
                else if (!strcmp(argv[1], "--name-only"))
                        diff_output_format = DIFF_FORMAT_NAME;
-               else if (!strcmp(argv[1], "--name-only-z"))
-                       diff_output_format = DIFF_FORMAT_NAME_Z;
                else if (!strcmp(argv[1], "-R"))
                        diff_setup_opt |= DIFF_SETUP_REVERSE;
                else if (!strncmp(argv[1], "-S", 2))
@@ -93,6 +95,10 @@ int main(int argc, const char **argv)
                argv++; argc--;
        }
 
+       /* Find the directory, and set up the pathspec */
+       pathspec = get_pathspec(prefix, argv + 1);
+       entries = read_cache();
+
        if (find_copies_harder && detect_rename != DIFF_DETECT_COPY)
                usage(diff_files_usage);
 
@@ -112,6 +118,9 @@ int main(int argc, const char **argv)
                struct cache_entry *ce = active_cache[i];
                int changed;
 
+               if (!ce_path_match(ce, pathspec))
+                       continue;
+
                if (ce_stage(ce)) {
                        show_unmerge(ce->name);
                        while (i < entries &&
@@ -139,11 +148,11 @@ int main(int argc, const char **argv)
                              ce->sha1, (changed ? null_sha1 : ce->sha1),
                              ce->name);
        }
-       diffcore_std((1 < argc) ? argv + 1 : NULL,
+       diffcore_std(pathspec, 
                     detect_rename, diff_score_opt,
                     pickaxe, pickaxe_opts,
                     diff_break_opt,
                     orderfile, diff_filter);
-       diff_flush(diff_output_format);
+       diff_flush(diff_output_format, diff_line_termination);
        return 0;
 }