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 --- t/t4005-diff-rename-2.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 't') diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh index 2009aec88c..24d5365aa8 100644 --- a/t/t4005-diff-rename-2.sh +++ b/t/t4005-diff-rename-2.sh @@ -147,14 +147,13 @@ test_expect_success \ ################################################################ # tree has COPYING and rezrov. work tree has the same COPYING and -# copy-edited COPYING.1, and unchanged rezrov. We should see -# unmodified COPYING in the output, so that downstream diff-helper can -# notice. We should not say anything about rezrov. +# copy-edited COPYING.1, and unchanged rezrov. We should not say +# anything about rezrov nor COPYING, since the revised again diff-raw +# nows how to say Copy. git-diff-cache -C $tree >current cat >expected <<\EOF :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234 COPYING COPYING.1 -:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 M COPYING EOF test_expect_success \ -- cgit v1.2.3