diff --git a/diff-helper.c b/diff-helper.c
index 6456405b53bc9ff419e1133aa4da816fe761d911..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_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;
+ const char *garbage_flush_format;
strbuf_init(&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++;
}
+ garbage_flush_format = (line_termination == 0) ? "%s" : "%s\n";
+
/* the remaining parameters are paths patterns */
diff_setup(0);
if (!strchr("MCRNDU", status))
break;
two_paths = score = 0;
- if (status == 'R' || status == 'C') {
+ if (status == 'R' || status == 'C')
two_paths = 1;
- sscanf(cp, "%d", &score);
- if (line_termination) {
- cp = strchr(cp,
- inter_name_termination);
- if (!cp)
- break;
- }
- }
+ /* pick up score if exists */
+ if (sscanf(cp, "%d", &score) != 1)
+ score = 0;
+ cp = strchr(cp,
+ inter_name_termination);
+ if (!cp)
+ break;
if (*cp++ != inter_name_termination)
break;
new_path);
continue;
}
- if (1 < ac)
- diffcore_pathspec(av + 1);
- if (pickaxe)
- diffcore_pickaxe(pickaxe, pickaxe_opts);
- diff_flush(DIFF_FORMAT_PATCH, 0);
- printf("%s\n", sb.buf);
+ 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;
}