diff --git a/diff-helper.c b/diff-helper.c
index 04e6f2cd72b1d802662eb22fafbb5c5bb97b5f98..63aff6969863f6fb3da94c9866067e1c779831a3 100644 (file)
--- a/diff-helper.c
+++ b/diff-helper.c
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(av + 1,
- 0, 0, /* no renames */
- pickaxe, pickaxe_opts,
- -1, /* no breaks */
- orderfile);
- diff_flush(DIFF_FORMAT_PATCH, 0);
+ 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>] [-O<orderfile>] paths...";
+"git-diff-helper [-z] [-O<orderfile>] [-S<string>] [--pickaxe-all] [<path>...]";
int main(int ac, const char **av) {
struct strbuf sb;
}
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++;