t/t4003-diff-rename-1: use modern options to "diff"

diff --git a/diff-helper.c b/diff-helper.c
index 5b0feb1d8a856e3ecf6e81b4c95ea306d2ac5c97..568d5ae356c90177b376561c8b71c28b3c8d3f2f 100644 (file)
--- a/diff-helper.c
+++ b/diff-helper.c
@@ -7,6 +7,9 @@
 #include "diff.h"
 
 static int detect_rename = 0;
+static int diff_score_opt = 0;
+static int generate_patch = 1;
+static char *pickaxe = 0;
 
 static int parse_oneside_change(const char *cp, int *mode,
                                unsigned char *sha1, char *path)
@@ -19,15 +22,16 @@ static int parse_oneside_change(const char *cp, int *mode,
                cp++;
        }
        *mode = m;
-       if (strncmp(cp, "\tblob\t", 6))
+       if (strncmp(cp, "\tblob\t", 6) && strncmp(cp, " blob ", 6) &&
+           strncmp(cp, "\ttree\t", 6) && strncmp(cp, " tree ", 6))
                return -1;
        cp += 6;
        if (get_sha1_hex(cp, sha1))
                return -1;
        cp += 40;
-       if (*cp++ != '\t')
+       if ((*cp != '\t') && *cp != ' ')
                return -1;
-       strcpy(path, cp);
+       strcpy(path, ++cp);
        return 0;
 }
 
@@ -43,11 +47,13 @@ static int parse_diff_raw_output(const char *buf)
                diff_unmerge(cp + 1);
                break;
        case '+':
-               parse_oneside_change(cp, &new_mode, new_sha1, path);
+               if (parse_oneside_change(cp, &new_mode, new_sha1, path))
+                       return -1;
                diff_addremove('+', new_mode, new_sha1, path, NULL);
                break;
        case '-':
-               parse_oneside_change(cp, &old_mode, old_sha1, path);
+               if (parse_oneside_change(cp, &old_mode, old_sha1, path))
+                       return -1;
                diff_addremove('-', old_mode, old_sha1, path, NULL);
                break;
        case '*':
@@ -63,7 +69,8 @@ static int parse_diff_raw_output(const char *buf)
                        new_mode = (new_mode << 3) | (ch - '0');
                        cp++;
                }
-               if (strncmp(cp, "\tblob\t", 6))
+               if (strncmp(cp, "\tblob\t", 6) && strncmp(cp, " blob ", 6) &&
+                   strncmp(cp, "\ttree\t", 6) && strncmp(cp, " tree ", 6))
                        return -1;
                cp += 6;
                if (get_sha1_hex(cp, old_sha1))
@@ -75,10 +82,10 @@ static int parse_diff_raw_output(const char *buf)
                if (get_sha1_hex(cp, new_sha1))
                        return -1;
                cp += 40;
-               if (*cp++ != '\t')
+               if ((*cp != '\t') && *cp != ' ')
                        return -1;
-               strcpy(path, cp);
-               diff_change(old_mode, new_mode, old_sha1, new_sha1, path, 0);
+               strcpy(path, ++cp);
+               diff_change(old_mode, new_mode, old_sha1, new_sha1, path, NULL);
                break;
        default:
                return -1;
@@ -87,7 +94,7 @@ static int parse_diff_raw_output(const char *buf)
 }
 
 static const char *diff_helper_usage =
-       "git-diff-helper [-z] [-R] [-M] paths...";
+       "git-diff-helper [-z] [-R] [-M] [-C] [-S<string>] paths...";
 
 int main(int ac, const char **av) {
        struct strbuf sb;
@@ -101,15 +108,28 @@ int main(int ac, const char **av) {
                        reverse = 1;
                else if (av[1][1] == 'z')
                        line_termination = 0;
-               else if (av[1][1] == 'M')
+               else if (av[1][1] == 'p') /* hidden from the help */
+                       generate_patch = 0;
+               else if (av[1][1] == 'M') {
                        detect_rename = 1;
+                       diff_score_opt = diff_scoreopt_parse(av[1]);
+               }
+               else if (av[1][1] == 'C') {
+                       detect_rename = 2;
+                       diff_score_opt = diff_scoreopt_parse(av[1]);
+               }
+               else if (av[1][1] == 'S') {
+                       pickaxe = av[1] + 2;
+               }
                else
                        usage(diff_helper_usage);
                ac--; av++;
        }
        /* the remaining parameters are paths patterns */
 
-       diff_setup(detect_rename, 0, reverse, av+1, ac-1);
+       diff_setup(detect_rename, diff_score_opt, pickaxe,
+                  reverse, (generate_patch ? -1 : line_termination),
+                  av+1, ac-1);
 
        while (1) {
                int status;