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 git update-index
--add --remove file1 file2 file4
24 git commit
-m 'Initial Version' 2>/dev
/null
26 git checkout
-b binary
27 perl
-pe 'y/x/\000/' <file1
>file3
30 perl
-pe 'y/\000/v/' <file3
>file1
32 git update-index
--add --remove file1 file2 file3 file4
33 git commit
-m 'Second Version'
35 git diff-tree
-p master binary
>B.
diff
36 git diff-tree
-p -C master binary
>C.
diff
38 git diff-tree
-p --binary master binary
>BF.
diff
39 git diff-tree
-p --binary -C master binary
>CF.
diff
41 test_expect_success
'stat binary diff -- should not fail.' \
43 git apply --stat --summary B.diff'
45 test_expect_success
'stat binary diff (copy) -- should not fail.' \
47 git apply --stat --summary C.diff'
49 test_expect_success
'check binary diff -- should fail.' \
50 'git checkout master &&
51 test_must_fail git apply --check B.diff'
53 test_expect_success
'check binary diff (copy) -- should fail.' \
54 'git checkout master &&
55 test_must_fail git apply --check C.diff'
58 'check incomplete binary diff with replacement -- should fail.' '
59 git checkout master &&
60 test_must_fail git apply --check --allow-binary-replacement B.diff
64 'check incomplete binary diff with replacement (copy) -- should fail.' '
65 git checkout master &&
66 test_must_fail git apply --check --allow-binary-replacement C.diff
69 test_expect_success
'check binary diff with replacement.' \
71 git apply --check --allow-binary-replacement BF.diff'
73 test_expect_success
'check binary diff with replacement (copy).' \
75 git apply --check --allow-binary-replacement CF.diff'
77 # Now we start applying them.
82 git checkout
-f master
85 test_expect_success
'apply binary diff -- should fail.' \
87 test_must_fail git apply B.diff'
89 test_expect_success
'apply binary diff -- should fail.' \
91 test_must_fail git apply --index B.diff'
93 test_expect_success
'apply binary diff (copy) -- should fail.' \
95 test_must_fail git apply C.diff'
97 test_expect_success
'apply binary diff (copy) -- should fail.' \
99 test_must_fail git apply --index C.diff'
101 test_expect_success
'apply binary diff without replacement.' \
105 test_expect_success
'apply binary diff without replacement (copy).' \
109 test_expect_success
'apply binary diff.' \
111 git apply --allow-binary-replacement --index BF.diff &&
112 test -z "$(git diff --name-status binary)"'
114 test_expect_success
'apply binary diff (copy).' \
116 git apply --allow-binary-replacement --index CF.diff &&
117 test -z "$(git diff --name-status binary)"'