Don't use -C in "git diff"

diff --git a/diff-files.c b/diff-files.c
index 4e0a306ef580036beb21c24bb8b520563b35c172..b6d972e06284f4a2b68204003321d9d8bcd42739 100644 (file)
--- a/diff-files.c
+++ b/diff-files.c
@@ -7,13 +7,17 @@
 #include "diff.h"
 
 static const char *diff_files_usage =
-"git-diff-files [-p] [-q] [-r] [-z] [-M] [-C] [-R] [-S<string>] [paths...]";
+"git-diff-files [-p] [-q] [-r] [-z] [-M] [-C] [-R] [-S<string>] [-O<orderfile>] [paths...]";
 
 static int diff_output_format = DIFF_FORMAT_HUMAN;
 static int detect_rename = 0;
-static int reverse_diff = 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 diff_break_opt = -1;
+static const char *orderfile = NULL;
+static const char *diff_filter = NULL;
 static int silent = 0;
 
 static void show_unmerge(const char *path)
@@ -51,15 +55,30 @@ int main(int argc, const char **argv)
                else if (!strcmp(argv[1], "-z"))
                        diff_output_format = DIFF_FORMAT_MACHINE;
                else if (!strcmp(argv[1], "-R"))
-                       reverse_diff = 1;
-               else if (!strcmp(argv[1], "-S"))
+                       diff_setup_opt |= DIFF_SETUP_REVERSE;
+               else if (!strncmp(argv[1], "-S", 2))
                        pickaxe = argv[1] + 2;
+               else if (!strncmp(argv[1], "-O", 2))
+                       orderfile = argv[1] + 2;
+               else if (!strncmp(argv[1], "--diff-filter=", 14))
+                       diff_filter = argv[1] + 14;
+               else if (!strcmp(argv[1], "--pickaxe-all"))
+                       pickaxe_opts = DIFF_PICKAXE_ALL;
+               else if (!strncmp(argv[1], "-B", 2)) {
+                       if ((diff_break_opt =
+                            diff_scoreopt_parse(argv[1])) == -1)
+                               usage(diff_files_usage);
+               }
                else if (!strncmp(argv[1], "-M", 2)) {
-                       diff_score_opt = diff_scoreopt_parse(argv[1]);
+                       if ((diff_score_opt =
+                            diff_scoreopt_parse(argv[1])) == -1)
+                               usage(diff_files_usage);
                        detect_rename = DIFF_DETECT_RENAME;
                }
                else if (!strncmp(argv[1], "-C", 2)) {
-                       diff_score_opt = diff_scoreopt_parse(argv[1]);
+                       if ((diff_score_opt =
+                            diff_scoreopt_parse(argv[1])) == -1)
+                               usage(diff_files_usage);
                        detect_rename = DIFF_DETECT_COPY;
                }
                else
@@ -75,11 +94,11 @@ int main(int argc, const char **argv)
                exit(1);
        }
 
-       diff_setup(reverse_diff);
+       diff_setup(diff_setup_opt);
 
        for (i = 0; i < entries; i++) {
                struct stat st;
-               unsigned int oldmode, mode;
+               unsigned int oldmode;
                struct cache_entry *ce = active_cache[i];
                int changed;
 
@@ -107,19 +126,15 @@ int main(int argc, const char **argv)
                        continue;
 
                oldmode = ntohl(ce->ce_mode);
-               mode = (S_ISLNK(st.st_mode) ? S_IFLNK :
-                       S_IFREG | ce_permissions(st.st_mode));
-
-               show_modified(oldmode, mode, ce->sha1, null_sha1,
+               show_modified(oldmode, DIFF_FILE_CANON_MODE(st.st_mode),
+                             ce->sha1, null_sha1,
                              ce->name);
        }
-       if (detect_rename)
-               diffcore_rename(detect_rename, diff_score_opt);
-       diffcore_prune();
-       if (pickaxe)
-               diffcore_pickaxe(pickaxe);
-       if (1 < argc)
-               diffcore_pathspec(argv + 1);
+       diffcore_std((1 < argc) ? argv + 1 : NULL,
+                    detect_rename, diff_score_opt,
+                    pickaxe, pickaxe_opts,
+                    diff_break_opt,
+                    orderfile, diff_filter);
        diff_flush(diff_output_format);
        return 0;
 }