diff --git a/diff-tree.c b/diff-tree.c
index a29c738cbe70c6fd3e145ea14b59729081fbcd52..60ad2b5b6cd94b9026882ff6e353a846f02c7851 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
static int pickaxe_opts = 0;
static int diff_break_opt = -1;
static const char *orderfile = NULL;
+static const char *diff_filter = NULL;
static const char *header = NULL;
static const char *header_prefix = "";
static enum cmit_fmt commit_format = CMIT_FMT_RAW;
static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base)
{
while (size) {
- if (find_copies_harder || interesting(tree, size, base))
+ if (interesting(tree, size, base))
show_file(prefix, tree, size, base);
update_tree_entry(&tree, &size);
}
static int call_diff_flush(void)
{
- diffcore_std(find_copies_harder ? paths : 0,
+ diffcore_std(NULL,
detect_rename, diff_score_opt,
pickaxe, pickaxe_opts,
diff_break_opt,
- orderfile);
+ orderfile,
+ diff_filter);
if (diff_queue_is_empty()) {
- diff_flush(DIFF_FORMAT_NO_OUTPUT, 0);
+ diff_flush(DIFF_FORMAT_NO_OUTPUT);
return 0;
}
if (header) {
- const char *fmt = "%s";
- if (diff_output_format == DIFF_FORMAT_MACHINE)
- fmt = "%s%c";
-
- printf(fmt, header, 0);
+ printf("%s%c", header, diff_output_format == DIFF_FORMAT_MACHINE ? 0 : '\n');
header = NULL;
}
- diff_flush(diff_output_format, 1);
+ diff_flush(diff_output_format);
return 1;
}
return retval;
}
-static char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len)
+static const char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len)
{
static char this_header[16384];
int offset;
- offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent);
- if (verbose_header) {
- offset += pretty_print_commit(commit_format, msg, len, this_header + offset, sizeof(this_header) - offset);
- this_header[offset++] = '\n';
- this_header[offset++] = 0;
- }
+ if (!verbose_header)
+ return commit;
+ offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent);
+ offset += pretty_print_commit(commit_format, msg, len, this_header + offset, sizeof(this_header) - offset);
return this_header;
}
}
static char *diff_tree_usage =
-"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-O<orderfile>] [-m] [-s] [-v] [--pretty] [-t] <tree-ish> <tree-ish>";
-
-static enum cmit_fmt get_commit_format(const char *arg)
-{
- if (!*arg)
- return CMIT_FMT_DEFAULT;
- if (!strcmp(arg, "=raw"))
- return CMIT_FMT_RAW;
- if (!strcmp(arg, "=medium"))
- return CMIT_FMT_MEDIUM;
- if (!strcmp(arg, "=short"))
- return CMIT_FMT_SHORT;
- usage(diff_tree_usage);
-}
+"git-diff-tree [-p] [-r] [-z] [--stdin] [-m] [-s] [-v] [--pretty] [-t] [-R] [-B] [-M] [-C] [--find-copies-header] [-O<orderfile>] [-S<string>] [--pickaxe-all] <tree-ish> <tree-ish>";
int main(int argc, const char **argv)
{
orderfile = arg + 2;
continue;
}
+ if (!strncmp(arg, "--diff-filter=", 14)) {
+ diff_filter = arg + 14;
+ continue;
+ }
if (!strcmp(arg, "--pickaxe-all")) {
pickaxe_opts = DIFF_PICKAXE_ALL;
continue;