X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4116-apply-reverse.sh;h=2298ece8019d79ef718ef658bdac74493d265b92;hb=3f263099fca47c278e696fbc0f0d5525318eae0a;hp=9ae2b3a8efaad4430bbcea02152470b064263b2b;hpb=9656153b87d47b34986f2d77eef9199c24cbf9f6;p=git.git diff --git a/t/t4116-apply-reverse.sh b/t/t4116-apply-reverse.sh index 9ae2b3a8e..2298ece80 100755 --- 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]" '\''[\0\1\2]'\'' file2 && + perl -pe "y/ijk/\\000\\001\\002/" 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]" '\''[\0\1\2]'\'' file2 && + perl -pe "y/mon/\\000\\001\\002/" 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 . )