X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft4009-diff-rename-4.sh;h=6229a5bf1a9b82a2e64510d3ec9f9817d0dd0e0e;hb=51017101c7a308745ba3c04944457f1dc6a55780;hp=7d8ca6dc3580b6e72adb52232d208a86abe5332f;hpb=edb0c724287a0ee7cefa11f28ef43d8c5cfa1985;p=git.git diff --git a/t/t4009-diff-rename-4.sh b/t/t4009-diff-rename-4.sh old mode 100644 new mode 100755 index 7d8ca6dc..6229a5bf --- a/t/t4009-diff-rename-4.sh +++ b/t/t4009-diff-rename-4.sh @@ -57,8 +57,8 @@ copy to COPYING.1 - 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 @@ @@ -143,7 +143,7 @@ test_expect_success \ '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