Merge branch 'maint'

diff --git a/t/t4103-apply-binary.sh b/t/t4103-apply-binary.sh
index 011126f336d4f15600ea8905b3a5b1d4c69c9a6b..1b58233da6cfa09092e6953f7d9c6bc38d7bae56 100755 (executable)
--- a/t/t4103-apply-binary.sh
+++ b/t/t4103-apply-binary.sh
@@ -24,10 +24,10 @@ git update-index --add --remove file1 file2 file4
 git-commit -m 'Initial Version' 2>/dev/null
 
 git-checkout -b binary
-tr 'x' '\0' <file1 >file3
+perl -pe 'y/x/\000/' <file1 >file3
 cat file3 >file4
 git add file2
-tr '\0' 'v' <file3 >file1
+perl -pe 'y/\000/v/' <file3 >file1
 rm -f file2
 git update-index --add --remove file1 file2 file3 file4
 git-commit -m 'Second Version'
@@ -46,21 +46,25 @@ test_expect_success 'stat binary diff (copy) -- should not fail.' \
        'git-checkout master
         git apply --stat --summary C.diff'
 
-test_expect_failure 'check binary diff -- should fail.' \
-       'git-checkout master
-        git apply --check B.diff'
+test_expect_success 'check binary diff -- should fail.' \
+       'git-checkout master &&
+        ! git apply --check B.diff'
 
-test_expect_failure 'check binary diff (copy) -- should fail.' \
-       'git-checkout master
-        git apply --check C.diff'
+test_expect_success 'check binary diff (copy) -- should fail.' \
+       'git-checkout master &&
+        ! git apply --check C.diff'
 
-test_expect_failure 'check incomplete binary diff with replacement -- should fail.' \
-       'git-checkout master
-        git apply --check --allow-binary-replacement B.diff'
+test_expect_success \
+       'check incomplete binary diff with replacement -- should fail.' '
+       git-checkout master &&
+       ! git apply --check --allow-binary-replacement B.diff
+'
 
-test_expect_failure 'check incomplete binary diff with replacement (copy) -- should fail.' \
-       'git-checkout master
-        git apply --check --allow-binary-replacement C.diff'
+test_expect_success \
+    'check incomplete binary diff with replacement (copy) -- should fail.' '
+        git-checkout master &&
+        ! git apply --check --allow-binary-replacement C.diff
+'
 
 test_expect_success 'check binary diff with replacement.' \
        'git-checkout master
@@ -73,42 +77,42 @@ test_expect_success 'check binary diff with replacement (copy).' \
 # Now we start applying them.
 
 do_reset () {
-       rm -f file?
-       git-reset --hard
+       rm -f file? &&
+       git-reset --hard &&
        git-checkout -f master
 }
 
-test_expect_failure 'apply binary diff -- should fail.' \
-       'do_reset
-        git apply B.diff'
+test_expect_success 'apply binary diff -- should fail.' \
+       'do_reset &&
+        ! git apply B.diff'
 
-test_expect_failure 'apply binary diff -- should fail.' \
-       'do_reset
-        git apply --index B.diff'
+test_expect_success 'apply binary diff -- should fail.' \
+       'do_reset &&
+        ! git apply --index B.diff'
 
-test_expect_failure 'apply binary diff (copy) -- should fail.' \
-       'do_reset
-        git apply C.diff'
+test_expect_success 'apply binary diff (copy) -- should fail.' \
+       'do_reset &&
+        ! git apply C.diff'
 
-test_expect_failure 'apply binary diff (copy) -- should fail.' \
-       'do_reset
-        git apply --index C.diff'
+test_expect_success 'apply binary diff (copy) -- should fail.' \
+       'do_reset &&
+        ! git apply --index C.diff'
 
 test_expect_success 'apply binary diff without replacement.' \
-       'do_reset
+       'do_reset &&
         git apply BF.diff'
 
 test_expect_success 'apply binary diff without replacement (copy).' \
-       'do_reset
+       'do_reset &&
         git apply CF.diff'
 
 test_expect_success 'apply binary diff.' \
-       'do_reset
+       'do_reset &&
         git apply --allow-binary-replacement --index BF.diff &&
         test -z "$(git diff --name-status binary)"'
 
 test_expect_success 'apply binary diff (copy).' \
-       'do_reset
+       'do_reset &&
         git apply --allow-binary-replacement --index CF.diff &&
         test -z "$(git diff --name-status binary)"'