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

diff --git a/diff-cache.c b/diff-cache.c
index 0a6720de6c994e6bcf3cc9236c71ae4870725eda..1e0fda52993f76afc0ee866f3e29a43469fcfd7c 100644 (file)
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -206,7 +206,7 @@ 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;
                }
@@ -240,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, pickaxe_opts);
-       if (pathspec)
-               diffcore_pathspec(pathspec);
        diff_flush(diff_output_format, 1);
        return ret;
 }