X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=t%2Ft4003-diff-rename-1.sh;h=8e3091abb603f9d9a7a456459fac31d4f02e54e7;hb=379955c696a417f0fb6118f2fd91dbffd2816ad1;hp=7a5f73a3101cb7a5bb63dff6c2f00bcebcf12c2f;hpb=edb0c724287a0ee7cefa11f28ef43d8c5cfa1985;p=git.git diff --git a/t/t4003-diff-rename-1.sh b/t/t4003-diff-rename-1.sh old mode 100644 new mode 100755 index 7a5f73a3..8e3091ab --- a/t/t4003-diff-rename-1.sh +++ b/t/t4003-diff-rename-1.sh @@ -40,8 +40,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 @@ @@ -108,7 +108,8 @@ test_expect_success \ # the diff-core. Unchanged rezrov, although being fed to # git-diff-cache as well, should not be mentioned. -GIT_DIFF_OPTS=--unified=0 git-diff-cache -C -p $tree >current +GIT_DIFF_OPTS=--unified=0 \ + git-diff-cache -C --find-copies-harder -p $tree >current cat >expected <<\EOF diff --git a/COPYING b/COPYING.1 copy from COPYING