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

diff --git a/t/t4116-apply-reverse.sh b/t/t4116-apply-reverse.sh
index c3f45790076e8e5f80322ad272dc4bf1ff4b9715..2298ece8019d79ef718ef658bdac74493d265b92 100755 (executable)
--- a/t/t4116-apply-reverse.sh
+++ b/t/t4116-apply-reverse.sh
@@ -42,18 +42,18 @@ test_expect_success 'apply in reverse' '
        git reset --hard second &&
        git apply --reverse --binary --index patch &&
        git diff >diff &&
-       git diff /dev/null diff
+       test_cmp /dev/null diff
 
 '
 
 test_expect_success 'setup separate repository lacking postimage' '
 
-       git tar-tree initial initial | tar xf - &&
+       git tar-tree initial initial | $TAR xf - &&
        (
                cd initial && git init && git add .
        ) &&
 
-       git tar-tree second second | tar xf - &&
+       git tar-tree second second | $TAR xf - &&
        (
                cd second && git init && git add .
        )