summaryrefslogtreecommitdiff
path: root/diff-files.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-24 01:14:03 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-24 02:17:06 (GMT)
commitbceafe752c03f4b13b9b1671a55d9e2acd26432d (patch)
tree9036674db3bab78474a79b0445a8d8e178dc9151 /diff-files.c
parent9a4a100eb46a769d1c5fa80c2daeb0b48a592d8d (diff)
downloadgit-bceafe752c03f4b13b9b1671a55d9e2acd26432d.zip
git-bceafe752c03f4b13b9b1671a55d9e2acd26432d.tar.gz
git-bceafe752c03f4b13b9b1671a55d9e2acd26432d.tar.bz2
[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-files.c')
-rw-r--r--diff-files.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/diff-files.c b/diff-files.c
index 17c328a..d7cfad7 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -115,7 +115,6 @@ int main(int argc, const char **argv)
}
if (detect_rename)
diffcore_rename(detect_rename, diff_score_opt);
- diffcore_prune();
if (pickaxe)
diffcore_pickaxe(pickaxe);
if (1 < argc)