[PATCH] Fix diff-pruning logic which was running prune too early.
commitbceafe752c03f4b13b9b1671a55d9e2acd26432d
authorJunio C Hamano <junkio@cox.net>
Tue, 24 May 2005 01:14:03 +0000 (23 18:14 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 24 May 2005 02:17:06 +0000 (23 19:17 -0700)
tree9036674db3bab78474a79b0445a8d8e178dc9151
parent9a4a100eb46a769d1c5fa80c2daeb0b48a592d8d
[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>
diff-cache.c
diff-files.c
diff-tree.c
diff.c
diff.h
diffcore-rename.c
diffcore.h
t/t4005-diff-rename-2.sh