[PATCH] The diff-raw format updates.

[git.git] / diff-files.c

diff --git a/diff-files.c b/diff-files.c
index eb99c3c..884d452 100644 (file)
--- a/diff-files.c
+++ b/diff-files.c
@@ -7,13 +7,13 @@
 #include "diff.h"
 
 static const char *diff_files_usage =
-"git-diff-files [-p] [-q] [-r] [-z] [-M] [-R] [paths...]";
+"git-diff-files [-p] [-q] [-r] [-z] [-M] [-C] [-R] [-S<string>] [paths...]";
 
-static int generate_patch = 0;
-static int line_termination = '\n';
+static int diff_output_format = DIFF_FORMAT_HUMAN;
 static int detect_rename = 0;
 static int reverse_diff = 0;
 static int diff_score_opt = 0;
+static const char *pickaxe = NULL;
 static int silent = 0;
 
 static int matches_pathspec(struct cache_entry *ce, char **spec, int cnt)
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
 
        while (1 < argc && argv[1][0] == '-') {
                if (!strcmp(argv[1], "-p"))
-                       generate_patch = 1;
+                       diff_output_format = DIFF_FORMAT_PATCH;
                else if (!strcmp(argv[1], "-q"))
                        silent = 1;
                else if (!strcmp(argv[1], "-r"))
@@ -64,12 +64,18 @@ int main(int argc, char **argv)
                else if (!strcmp(argv[1], "-s"))
                        ; /* no-op */
                else if (!strcmp(argv[1], "-z"))
-                       line_termination = 0;
+                       diff_output_format = DIFF_FORMAT_MACHINE;
                else if (!strcmp(argv[1], "-R"))
                        reverse_diff = 1;
+               else if (!strcmp(argv[1], "-S"))
+                       pickaxe = argv[1] + 2;
                else if (!strncmp(argv[1], "-M", 2)) {
                        diff_score_opt = diff_scoreopt_parse(argv[1]);
-                       detect_rename = generate_patch = 1;
+                       detect_rename = 1;
+               }
+               else if (!strncmp(argv[1], "-C", 2)) {
+                       diff_score_opt = diff_scoreopt_parse(argv[1]);
+                       detect_rename = 2;
                }
                else
                        usage(diff_files_usage);
@@ -84,9 +90,7 @@ int main(int argc, char **argv)
                exit(1);
        }
 
-       diff_setup(detect_rename, diff_score_opt, reverse_diff,
-                  (generate_patch ? -1 : line_termination),
-                  0, 0);
+       diff_setup(reverse_diff, diff_output_format);
 
        for (i = 0; i < entries; i++) {
                struct stat st;
@@ -118,7 +122,7 @@ int main(int argc, char **argv)
                        continue;
                }
                changed = ce_match_stat(ce, &st);
-               if (!changed)
+               if (!changed && detect_rename < 2)
                        continue;
 
                oldmode = ntohl(ce->ce_mode);
@@ -128,6 +132,10 @@ int main(int argc, char **argv)
                show_modified(oldmode, mode, ce->sha1, null_sha1,
                              ce->name);
        }
-       diff_flush();
+       if (detect_rename)
+               diff_detect_rename(detect_rename, diff_score_opt);
+       if (pickaxe)
+               diff_pickaxe(pickaxe);
+       diff_flush(NULL, 0);
        return 0;
 }