index 7d8ca6dc3580b6e72adb52232d208a86abe5332f..6229a5bf1a9b82a2e64510d3ec9f9817d0dd0e0e 100644 (file)
--- a/t/t4009-diff-rename-4.sh
+++ b/t/t4009-diff-rename-4.sh
- HOWEVER, in order to allow a migration to GPLv3 if that seems like
+ However, in order to allow a migration to GPLv3 if that seems like
diff --git a/COPYING b/COPYING.2
-rename old COPYING
-rename new COPYING.2
+rename from COPYING
+rename to COPYING.2
--- a/COPYING
+++ b/COPYING.2
@@ -2 +2 @@
'cat ../../COPYING >COPYING &&
git-update-cache --add --remove COPYING COPYING.1'
-git-diff-cache -z -C $tree >current
+git-diff-cache -z -C --find-copies-harder $tree >current
cat >expected <<\EOF
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234
COPYING