Merge branch 'maint' into bc/master-diff-hunk-header-fix

diff --git a/t/t0022-crlf-rename.sh b/t/t0022-crlf-rename.sh
index 430a1d1d385b756c921652b2fc3580a727c57917..f1e1d48869a25c6ab1d0b570eb4c0e28afc5fa05 100755 (executable)
--- a/t/t0022-crlf-rename.sh
+++ b/t/t0022-crlf-rename.sh
@@ -6,13 +6,13 @@ test_description='ignore CR in CRLF sequence while computing similiarity'
 
 test_expect_success setup '
 
-       cat ../t0022-crlf-rename.sh >sample &&
+       cat "$TEST_DIRECTORY"/t0022-crlf-rename.sh >sample &&
        git add sample &&
 
        test_tick &&
        git commit -m Initial &&
 
-       sed -e "s/\$/\r/" ../t0022-crlf-rename.sh >elpmas &&
+       sed -e "s/\$/\r/" "$TEST_DIRECTORY"/t0022-crlf-rename.sh >elpmas &&
        git add elpmas &&
        rm -f sample &&
 
@@ -26,7 +26,7 @@ test_expect_success 'diff -M' '
        git diff-tree -M -r --name-status HEAD^ HEAD |
        sed -e "s/R[0-9]*/RNUM/" >actual &&
        echo "RNUM      sample  elpmas" >expect &&
-       diff -u expect actual
+       test_cmp expect actual
 
 '