projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Redo rename/copy detection logic.
[git.git]
/
diff-tree.c
diff --git
a/diff-tree.c
b/diff-tree.c
index
0d21b18
..
a7e7345
100644
(file)
--- a/
diff-tree.c
+++ b/
diff-tree.c
@@
-266,13
+266,11
@@
static int call_diff_flush(void)
{
if (detect_rename)
diffcore_rename(detect_rename, diff_score_opt);
{
if (detect_rename)
diffcore_rename(detect_rename, diff_score_opt);
- diffcore_prune();
- if (pickaxe) {
+ if (pickaxe)
diffcore_pickaxe(pickaxe);
diffcore_pickaxe(pickaxe);
- if (diff_queue_is_empty()) {
- diff_flush(DIFF_FORMAT_NO_OUTPUT, 0);
- return 0;
- }
+ if (diff_queue_is_empty()) {
+ diff_flush(DIFF_FORMAT_NO_OUTPUT, 0);
+ return 0;
}
if (nr_paths)
diffcore_pathspec(paths);
}
if (nr_paths)
diffcore_pathspec(paths);