diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-23 18:14:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-23 19:17:06 -0700 |
| commit | bceafe752c03f4b13b9b1671a55d9e2acd26432d (patch) | |
| tree | 9036674db3bab78474a79b0445a8d8e178dc9151 /t | |
| parent | 9a4a100eb46a769d1c5fa80c2daeb0b48a592d8d (diff) | |
| download | git-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 't')
| -rw-r--r-- | t/t4005-diff-rename-2.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh index 2009aec88..24d5365aa 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 \ |