X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=t%2Ft4007-rename-3.sh;h=a55d6b65d191b338194e945408c4f8b807cfba52;hb=dc93841715dfa9a9cdda6f2c4a25eec831ea7aa0;hp=518892b90c7cbb3fb193d6bfb622046aff0f4431;hpb=6145ee8b361959db04b8cdefc883e4fc2dc27276;p=git.git diff --git a/t/t4007-rename-3.sh b/t/t4007-rename-3.sh index 518892b9..a55d6b65 100644 --- a/t/t4007-rename-3.sh +++ b/t/t4007-rename-3.sh @@ -7,20 +7,7 @@ test_description='Rename interaction with pathspec. ' . ./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' \