From bceafe752c03f4b13b9b1671a55d9e2acd26432d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 23 May 2005 18:14:03 -0700 Subject: [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 Signed-off-by: Linus Torvalds --- diff-files.c | 1 - 1 file changed, 1 deletion(-) (limited to 'diff-files.c') diff --git a/diff-files.c b/diff-files.c index 17c328a807..d7cfad79e7 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) -- cgit v1.2.1