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 tr 'x' '\0' <file1 >file3
30 tr '\0' '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_failure 'check binary diff -- should fail.' \
51 git-apply --check B.diff'
53 test_expect_failure 'check binary diff (copy) -- should fail.' \
55 git-apply --check C.diff'
57 test_expect_failure 'check incomplete binary diff with replacement -- should fail.' \
59 git-apply --check --allow-binary-replacement B.diff'
61 test_expect_failure 'check incomplete binary diff with replacement (copy) -- should fail.' \
63 git-apply --check --allow-binary-replacement C.diff'
65 test_expect_success 'check binary diff with replacement.' \
67 git-apply --check --allow-binary-replacement BF.diff'
69 test_expect_success 'check binary diff with replacement (copy).' \
71 git-apply --check --allow-binary-replacement CF.diff'
73 # Now we start applying them.
78 git-checkout -f master
81 test_expect_failure 'apply binary diff -- should fail.' \
85 test_expect_failure 'apply binary diff -- should fail.' \
87 git-apply --index B.diff'
89 test_expect_failure 'apply binary diff (copy) -- should fail.' \
93 test_expect_failure 'apply binary diff (copy) -- should fail.' \
95 git-apply --index C.diff'
97 test_expect_success 'apply binary diff without replacement.' \
101 test_expect_success 'apply binary diff without replacement (copy).' \
105 test_expect_success 'apply binary diff.' \
107 git-apply --allow-binary-replacement --index BF.diff &&
108 test -z "$(git-diff --name-status binary)"'
110 test_expect_success 'apply binary diff (copy).' \
112 git-apply --allow-binary-replacement --index CF.diff &&
113 test -z "$(git-diff --name-status binary)"'