3 # Copyright (c) 2005 Junio C Hamano
6 test_description
='git apply handling binary patches
14 A quick brown fox jumps over the lazy dog.
15 A tiny little penguin runs around in circles.
16 There is a flag with Linux written on it.
17 A slow black-and-white panda just sits there,
18 munching on his bamboo.
23 test_expect_success
'setup' "
24 git update-index --add --remove file1 file2 file4 &&
25 git commit -m 'Initial Version' 2>/dev/null &&
27 git checkout -b binary &&
28 perl -pe 'y/x/\000/' <file1 >file3 &&
31 perl -pe 'y/\000/v/' <file3 >file1 &&
33 git update-index --add --remove file1 file2 file3 file4 &&
34 git commit -m 'Second Version' &&
36 git diff-tree -p master binary >B.diff &&
37 git diff-tree -p -C master binary >C.diff &&
39 git diff-tree -p --binary master binary >BF.diff &&
40 git diff-tree -p --binary -C master binary >CF.diff
43 test_expect_success
'stat binary diff -- should not fail.' \
45 git apply --stat --summary B.diff'
47 test_expect_success
'stat binary diff (copy) -- should not fail.' \
49 git apply --stat --summary C.diff'
51 test_expect_success
'check binary diff -- should fail.' \
52 'git checkout master &&
53 test_must_fail git apply --check B.diff'
55 test_expect_success
'check binary diff (copy) -- should fail.' \
56 'git checkout master &&
57 test_must_fail git apply --check C.diff'
60 'check incomplete binary diff with replacement -- should fail.' '
61 git checkout master &&
62 test_must_fail git apply --check --allow-binary-replacement B.diff
66 'check incomplete binary diff with replacement (copy) -- should fail.' '
67 git checkout master &&
68 test_must_fail git apply --check --allow-binary-replacement C.diff
71 test_expect_success
'check binary diff with replacement.' \
73 git apply --check --allow-binary-replacement BF.diff'
75 test_expect_success
'check binary diff with replacement (copy).' \
77 git apply --check --allow-binary-replacement CF.diff'
79 # Now we start applying them.
84 git checkout
-f master
87 test_expect_success
'apply binary diff -- should fail.' \
89 test_must_fail git apply B.diff'
91 test_expect_success
'apply binary diff -- should fail.' \
93 test_must_fail git apply --index B.diff'
95 test_expect_success
'apply binary diff (copy) -- should fail.' \
97 test_must_fail git apply C.diff'
99 test_expect_success
'apply binary diff (copy) -- should fail.' \
101 test_must_fail git apply --index C.diff'
103 test_expect_success
'apply binary diff without replacement.' \
107 test_expect_success
'apply binary diff without replacement (copy).' \
111 test_expect_success
'apply binary diff.' \
113 git apply --allow-binary-replacement --index BF.diff &&
114 test -z "$(git diff --name-status binary)"'
116 test_expect_success
'apply binary diff (copy).' \
118 git apply --allow-binary-replacement --index CF.diff &&
119 test -z "$(git diff --name-status binary)"'