aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-06 22:45:21 -0700
committerJunio C Hamano <junkio@cox.net>2006-09-07 02:44:40 -0700
commit2b6eef943ff81df63a809857b7b400ee175eb29b (patch)
tree8fab428249716f64abbe1a2286f6ab2b3ee3beb1 /t
parent7bbf88c52b202d543310123e1bad9a44b2d6f028 (diff)
downloadgit-2b6eef943ff81df63a809857b7b400ee175eb29b.tar.gz
git-2b6eef943ff81df63a809857b7b400ee175eb29b.tar.xz
Make apply --binary a no-op.
Historically we did not allow binary patch applied without an explicit permission from the user, and this flag was the way to do so. This makes the flag a no-op by always allowing binary patch application. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
-rwxr-xr-xt/t4103-apply-binary.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4103-apply-binary.sh b/t/t4103-apply-binary.sh
index ff052699a..e2b1124c7 100755
--- a/t/t4103-apply-binary.sh
+++ b/t/t4103-apply-binary.sh
@@ -94,11 +94,11 @@ test_expect_failure 'apply binary diff (copy) -- should fail.' \
'do_reset
git-apply --index C.diff'
-test_expect_failure 'apply binary diff without replacement -- should fail.' \
+test_expect_success 'apply binary diff without replacement.' \
'do_reset
git-apply BF.diff'
-test_expect_failure 'apply binary diff without replacement (copy) -- should fail.' \
+test_expect_success 'apply binary diff without replacement (copy).' \
'do_reset
git-apply CF.diff'