diff options
Diffstat (limited to 't')
| -rw-r--r-- | t/t4003-diff-rename-1.sh | 3 | ||||
| -rw-r--r-- | t/t4005-diff-rename-2.sh | 2 | ||||
| -rw-r--r-- | t/t4007-rename-3.sh | 2 | ||||
| -rw-r--r-- | t/t4009-diff-rename-4.sh | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/t/t4003-diff-rename-1.sh b/t/t4003-diff-rename-1.sh index 63a3103b4b..8e3091abb6 100644 --- a/t/t4003-diff-rename-1.sh +++ b/t/t4003-diff-rename-1.sh @@ -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 diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh index 1921299fbc..cee06e4c5d 100644 --- a/t/t4005-diff-rename-2.sh +++ b/t/t4005-diff-rename-2.sh @@ -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 diff --git a/t/t4007-rename-3.sh b/t/t4007-rename-3.sh index a55d6b65d1..ab83ea3b8a 100644 --- a/t/t4007-rename-3.sh +++ b/t/t4007-rename-3.sh @@ -26,7 +26,7 @@ test_expect_success \ # path1 both have COPYING and the latter is a copy of path0/COPYING. # Comparing the full tree with cache should tell us so. -git-diff-cache -C $tree >current +git-diff-cache -C --find-copies-harder $tree >current cat >expected <<\EOF :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 C100 path0/COPYING path1/COPYING diff --git a/t/t4009-diff-rename-4.sh b/t/t4009-diff-rename-4.sh index 318915f447..6229a5bf1a 100644 --- a/t/t4009-diff-rename-4.sh +++ b/t/t4009-diff-rename-4.sh @@ -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 |