[PATCH] diff: Update -B heuristics.

diff --git a/diff-tree.c b/diff-tree.c
index db37aa714f0d0a7b0b2437ffb5b04351642f1e00..3881c23ca37a86c41ec12b2d5c4713ab01cc9d82 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -44,10 +44,12 @@ static const unsigned char *extract(void *tree, unsigned long size, const char *
        int len = strlen(tree)+1;
        const unsigned char *sha1 = tree + len;
        const char *path = strchr(tree, ' ');
+       unsigned int mode;
 
-       if (!path || size < len + 20 || sscanf(tree, "%o", modep) != 1)
+       if (!path || size < len + 20 || sscanf(tree, "%o", &mode) != 1)
                die("corrupt tree file");
        *pathp = path+1;
+       *modep = DIFF_FILE_CANON_MODE(mode);
        return sha1;
 }
 
@@ -395,7 +397,7 @@ static int diff_tree_stdin(char *line)
 }
 
 static char *diff_tree_usage =
-"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-m] [-s] [-v] [-t] <tree-ish> <tree-ish>";
+"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-O<orderfile>] [-m] [-s] [-v] [-t] <tree-ish> <tree-ish>";
 
 int main(int argc, const char **argv)
 {
@@ -457,16 +459,19 @@ int main(int argc, const char **argv)
                }
                if (!strncmp(arg, "-M", 2)) {
                        detect_rename = DIFF_DETECT_RENAME;
-                       diff_score_opt = diff_scoreopt_parse(arg);
+                       if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
+                               usage(diff_tree_usage);
                        continue;
                }
                if (!strncmp(arg, "-C", 2)) {
                        detect_rename = DIFF_DETECT_COPY;
-                       diff_score_opt = diff_scoreopt_parse(arg);
+                       if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
+                               usage(diff_tree_usage);
                        continue;
                }
                if (!strncmp(arg, "-B", 2)) {
-                       diff_break_opt = diff_scoreopt_parse(arg);
+                       if ((diff_break_opt = diff_scoreopt_parse(arg)) == -1)
+                               usage(diff_tree_usage);
                        continue;
                }
                if (!strcmp(arg, "-z")) {