aboutsummaryrefslogtreecommitdiff
path: root/diff-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-23 18:14:03 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-23 19:17:06 -0700
commitbceafe752c03f4b13b9b1671a55d9e2acd26432d (patch)
tree9036674db3bab78474a79b0445a8d8e178dc9151 /diff-tree.c
parent9a4a100eb46a769d1c5fa80c2daeb0b48a592d8d (diff)
downloadgit-bceafe752c03f4b13b9b1671a55d9e2acd26432d.tar.gz
git-bceafe752c03f4b13b9b1671a55d9e2acd26432d.tar.xz
[PATCH] Fix diff-pruning logic which was running prune too early.
For later stages to reorder patches, pruning logic and rename detection logic should not decide which delete to discard (because another entry said it will take over the file as a rename) until the very end. Also fix some tests that were assuming the earlier "last one is rename or keep everything else is copy" semantics of diff-raw format, which no longer is true. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff-tree.c')
-rw-r--r--diff-tree.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/diff-tree.c b/diff-tree.c
index 31f801904..a7e7345bd 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -266,10 +266,8 @@ static int call_diff_flush(void)
{
if (detect_rename)
diffcore_rename(detect_rename, diff_score_opt);
- diffcore_prune();
if (pickaxe)
diffcore_pickaxe(pickaxe);
-
if (diff_queue_is_empty()) {
diff_flush(DIFF_FORMAT_NO_OUTPUT, 0);
return 0;