[PATCH] diff-helper: Fix R/C score parsing under -z flag.

diff --git a/diff-cache.c b/diff-cache.c
index 963c628ed40ab109c3cd13195684c05e2a18ac49..1e0fda52993f76afc0ee866f3e29a43469fcfd7c 100644 (file)
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -8,6 +8,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;
 
 /* A file entry went away or appeared */
 static void show_file(const char *prefix, struct cache_entry *ce, unsigned char *sha1, unsigned int mode)
@@ -205,10 +206,14 @@ int main(int argc, const char **argv)
                        diff_setup_opt |= DIFF_SETUP_REVERSE;
                        continue;
                }
-               if (!strcmp(arg, "-S")) {
+               if (!strncmp(arg, "-S", 2)) {
                        pickaxe = arg + 2;
                        continue;
                }
+               if (!strcmp(arg, "--pickaxe-all")) {
+                       pickaxe_opts = DIFF_PICKAXE_ALL;
+                       continue;
+               }
                if (!strcmp(arg, "-m")) {
                        match_nonexisting = 1;
                        continue;
@@ -235,12 +240,12 @@ int main(int argc, const char **argv)
                die("unable to read tree object %s", tree_name);
 
        ret = diff_cache(active_cache, active_nr);
+       if (pathspec)
+               diffcore_pathspec(pathspec);
        if (detect_rename)
                diffcore_rename(detect_rename, diff_score_opt);
        if (pickaxe)
-               diffcore_pickaxe(pickaxe);
-       if (pathspec)
-               diffcore_pathspec(pathspec);
+               diffcore_pickaxe(pickaxe, pickaxe_opts);
        diff_flush(diff_output_format, 1);
        return ret;
 }