[PATCH] diff: consolidate test helper script pieces.

diff --git a/diff-files.c b/diff-files.c
index bd0eb95f85f1ebfd684e4177ca85c54b585da138..f3a79e5c03676f340424913a354d35a9c5c61554 100644 (file)
--- a/diff-files.c
+++ b/diff-files.c
@@ -15,6 +15,8 @@ static int diff_setup_opt = 0;
 static int diff_score_opt = 0;
 static const char *pickaxe = NULL;
 static int pickaxe_opts = 0;
+static int diff_break_opt = -1;
+static const char *orderfile = NULL;
 static int silent = 0;
 
 static void show_unmerge(const char *path)
@@ -53,10 +55,14 @@ int main(int argc, const char **argv)
                        diff_output_format = DIFF_FORMAT_MACHINE;
                else if (!strcmp(argv[1], "-R"))
                        diff_setup_opt |= DIFF_SETUP_REVERSE;
-               else if (!strcmp(argv[1], "-S"))
+               else if (!strncmp(argv[1], "-S", 2))
                        pickaxe = argv[1] + 2;
+               else if (!strncmp(argv[1], "-O", 2))
+                       orderfile = argv[1] + 2;
                else if (!strcmp(argv[1], "--pickaxe-all"))
                        pickaxe_opts = DIFF_PICKAXE_ALL;
+               else if (!strncmp(argv[1], "-B", 2))
+                       diff_break_opt = diff_scoreopt_parse(argv[1]);
                else if (!strncmp(argv[1], "-M", 2)) {
                        diff_score_opt = diff_scoreopt_parse(argv[1]);
                        detect_rename = DIFF_DETECT_RENAME;
@@ -116,12 +122,11 @@ int main(int argc, const char **argv)
                show_modified(oldmode, mode, ce->sha1, null_sha1,
                              ce->name);
        }
-       if (1 < argc)
-               diffcore_pathspec(argv + 1);
-       if (detect_rename)
-               diffcore_rename(detect_rename, diff_score_opt);
-       if (pickaxe)
-               diffcore_pickaxe(pickaxe, pickaxe_opts);
+       diffcore_std((1 < argc) ? argv + 1 : NULL,
+                    detect_rename, diff_score_opt,
+                    pickaxe, pickaxe_opts,
+                    diff_break_opt,
+                    orderfile);
        diff_flush(diff_output_format, 1);
        return 0;
 }