[PATCH] Add --pickaxe-all to diff-* brothers.
[git/git.git] / diff-tree.c
index c41cdd0..c66c787 100644 (file)
@@ -13,6 +13,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 diff_setup_opt = 0;
 static int diff_score_opt = 0;
 static const char *pickaxe = NULL;
+static int pickaxe_opts = 0;
 static const char *header = NULL;
 static const char *header_prefix = "";
 
 static const char *header = NULL;
 static const char *header_prefix = "";
 
@@ -263,7 +264,7 @@ static int call_diff_flush(void)
        if (detect_rename)
                diffcore_rename(detect_rename, diff_score_opt);
        if (pickaxe)
        if (detect_rename)
                diffcore_rename(detect_rename, diff_score_opt);
        if (pickaxe)
-               diffcore_pickaxe(pickaxe);
+               diffcore_pickaxe(pickaxe, pickaxe_opts);
        if (diff_queue_is_empty()) {
                diff_flush(DIFF_FORMAT_NO_OUTPUT, 0);
                return 0;
        if (diff_queue_is_empty()) {
                diff_flush(DIFF_FORMAT_NO_OUTPUT, 0);
                return 0;
@@ -509,6 +510,10 @@ int main(int argc, const char **argv)
                        pickaxe = arg + 2;
                        continue;
                }
                        pickaxe = arg + 2;
                        continue;
                }
+               if (!strcmp(arg, "--pickaxe-all")) {
+                       pickaxe_opts = DIFF_PICKAXE_ALL;
+                       continue;
+               }
                if (!strncmp(arg, "-M", 2)) {
                        detect_rename = DIFF_DETECT_RENAME;
                        diff_score_opt = diff_scoreopt_parse(arg);
                if (!strncmp(arg, "-M", 2)) {
                        detect_rename = DIFF_DETECT_RENAME;
                        diff_score_opt = diff_scoreopt_parse(arg);