Merge git://github.com/git-l10n/git-po

[git.git] / t / t4116-apply-reverse.sh

diff --git a/t/t4116-apply-reverse.sh b/t/t4116-apply-reverse.sh
index b1d35ab04db88f849c024208a541c0a594f0ed3b..2298ece8019d79ef718ef658bdac74493d265b92 100755 (executable)
--- a/t/t4116-apply-reverse.sh
+++ b/t/t4116-apply-reverse.sh
@@ -12,14 +12,14 @@ test_description='git apply in reverse
 test_expect_success setup '
 
        for i in a b c d e f g h i j k l m n; do echo $i; done >file1 &&
-       tr "ijk" '\''\000\001\002'\'' <file1 >file2 &&
+       perl -pe "y/ijk/\\000\\001\\002/" <file1 >file2 &&
 
        git add file1 file2 &&
        git commit -m initial &&
        git tag initial &&
 
        for i in a b c g h i J K L m o n p q; do echo $i; done >file1 &&
-       tr "mon" '\''\000\001\002'\'' <file1 >file2 &&
+       perl -pe "y/mon/\\000\\001\\002/" <file1 >file2 &&
 
        git commit -a -m second &&
        git tag second &&
@@ -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 .
        )