diff --git a/t/t4007-rename-3.sh b/t/t4007-rename-3.sh
index 518892b90c7cbb3fb193d6bfb622046aff0f4431..ab83ea3b8abdc7228455c9dd326c1f179a02b5f5 100644 (file)
--- a/t/t4007-rename-3.sh
+++ b/t/t4007-rename-3.sh
'
. ./test-lib.sh
-
-_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
-_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
-sanitize_diff_raw='s/ \('"$_x40"'\) \1 \([CR]\)[0-9]* / \1 \1 \2# /'
-compare_diff_raw () {
- # When heuristics are improved, the score numbers would change.
- # Ignore them while comparing.
- # Also we do not check SHA1 hash generation in this test, which
- # is a job for t0000-basic.sh
-
- sed -e "$sanitize_diff_raw" <"$1" >.tmp-1
- sed -e "$sanitize_diff_raw" <"$2" >.tmp-2
- diff -u .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2
-}
+. ../diff-lib.sh ;# test-lib chdir's into trash
test_expect_success \
'prepare reference tree' \
# 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