X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=t%2Ft4005-diff-rename-2.sh;h=cee06e4c5dd2530c2147baa09434356b020b7933;hb=0516de30e8bdd26086e2a3edd3375981fd0c34d6;hp=fa2b1556b2ae2faa52a54db7b180aaa90baabe96;hpb=edb0c724287a0ee7cefa11f28ef43d8c5cfa1985;p=git.git diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh old mode 100644 new mode 100755 index fa2b1556..cee06e4c --- a/t/t4005-diff-rename-2.sh +++ b/t/t4005-diff-rename-2.sh @@ -53,8 +53,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 @@ @@ -136,7 +136,7 @@ test_expect_success \ 'cat ../../COPYING >COPYING && git-update-cache --add --remove COPYING COPYING.1' -git-diff-cache -C $tree >current +git-diff-cache -C --find-copies-harder $tree >current cat >expected <<\EOF :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234 COPYING COPYING.1 EOF