projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Make -C less eager.
[git.git]
/
diff-tree.c
diff --git
a/diff-tree.c
b/diff-tree.c
index
a29c738
..
7446e09
100644
(file)
--- a/
diff-tree.c
+++ b/
diff-tree.c
@@
-18,6
+18,7
@@
static const char *pickaxe = NULL;
static int pickaxe_opts = 0;
static int diff_break_opt = -1;
static const char *orderfile = NULL;
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 const char *header = NULL;
static const char *header_prefix = "";
static enum cmit_fmt commit_format = CMIT_FMT_RAW;
@@
-200,7
+201,7
@@
static int interesting(void *tree, unsigned long size, const char *base)
static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base)
{
while (size) {
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);
}
show_file(prefix, tree, size, base);
update_tree_entry(&tree, &size);
}
@@
-268,13
+269,14
@@
static void call_diff_setup(void)
static int call_diff_flush(void)
{
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,
detect_rename, diff_score_opt,
pickaxe, pickaxe_opts,
diff_break_opt,
- orderfile);
+ orderfile,
+ diff_filter);
if (diff_queue_is_empty()) {
if (diff_queue_is_empty()) {
- diff_flush(DIFF_FORMAT_NO_OUTPUT
, 0
);
+ diff_flush(DIFF_FORMAT_NO_OUTPUT);
return 0;
}
if (header) {
return 0;
}
if (header) {
@@
-285,7
+287,7
@@
static int call_diff_flush(void)
printf(fmt, header, 0);
header = NULL;
}
printf(fmt, header, 0);
header = NULL;
}
- diff_flush(diff_output_format
, 1
);
+ diff_flush(diff_output_format);
return 1;
}
return 1;
}
@@
-399,7
+401,7
@@
static int diff_tree_stdin(char *line)
}
static char *diff_tree_usage =
}
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>";
+"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>";
static enum cmit_fmt get_commit_format(const char *arg)
{
static enum cmit_fmt get_commit_format(const char *arg)
{
@@
-468,6
+470,10
@@
int main(int argc, const char **argv)
orderfile = arg + 2;
continue;
}
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;
if (!strcmp(arg, "--pickaxe-all")) {
pickaxe_opts = DIFF_PICKAXE_ALL;
continue;