git-cvsimport-script: more error handling

[git.git] / diff-helper.c

diff --git a/diff-helper.c b/diff-helper.c
index c9e287f..63aff69 100644 (file)
--- a/diff-helper.c
+++ b/diff-helper.c
@@ -7,11 +7,21 @@
 
 static const char *pickaxe = NULL;
 static int pickaxe_opts = 0;
+static const char *orderfile = NULL;
+static const char *diff_filter = NULL;
 static int line_termination = '\n';
 static int inter_name_termination = '\t';
 
+static void flush_them(int ac, const char **av)
+{
+       diffcore_std_no_resolve(av + 1,
+                               pickaxe, pickaxe_opts,
+                               orderfile, diff_filter);
+       diff_flush(DIFF_FORMAT_PATCH);
+}
+
 static const char *diff_helper_usage =
-       "git-diff-helper [-z] [-S<string>] paths...";
+"git-diff-helper [-z] [-O<orderfile>] [-S<string>] [--pickaxe-all] [<path>...]";
 
 int main(int ac, const char **av) {
        struct strbuf sb;
@@ -27,6 +37,10 @@ int main(int ac, const char **av) {
                }
                else if (!strcmp(av[1], "--pickaxe-all"))
                        pickaxe_opts = DIFF_PICKAXE_ALL;
+               else if (!strncmp(av[1], "--diff-filter=", 14))
+                       diff_filter = av[1] + 14;
+               else if (!strncmp(av[1], "-O", 2))
+                       orderfile = av[1] + 2;
                else
                        usage(diff_helper_usage);
                ac--; av++;
@@ -131,17 +145,9 @@ int main(int ac, const char **av) {
                                          new_path);
                        continue;
                }
-               if (1 < ac)
-                       diffcore_pathspec(av + 1);
-               if (pickaxe)
-                       diffcore_pickaxe(pickaxe, pickaxe_opts);
-               diff_flush(DIFF_FORMAT_PATCH, 0);
+               flush_them(ac, av);
                printf(garbage_flush_format, sb.buf);
        }
-       if (1 < ac)
-               diffcore_pathspec(av + 1);
-       if (pickaxe)
-               diffcore_pickaxe(pickaxe, pickaxe_opts);
-       diff_flush(DIFF_FORMAT_PATCH, 0);
+       flush_them(ac, av);
        return 0;
 }