3 # Copyright (c) 2006 Junio C Hamano
6 test_description
='Binary diff and apply
11 cat >expect.binary-numstat
<<\EOF
18 test_expect_success
'prepare repository' \
19 'echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
20 git update-index --add a b c d &&
22 cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
31 4 files changed
, 2 insertions
(+), 2 deletions
(-)
33 test_expect_success
'"apply --stat" output for binary file change' '
35 git apply --stat --summary <diff >current &&
36 test_i18ncmp expected current
39 test_expect_success
'apply --numstat notices binary file change' '
41 git apply --numstat <diff >current &&
42 test_cmp expect.binary-numstat current
45 test_expect_success
'apply --numstat understands diff --binary format' '
46 git diff --binary >diff &&
47 git apply --numstat <diff >current &&
48 test_cmp expect.binary-numstat current
51 # apply needs to be able to skip the binary material correctly
52 # in order to report the line number of a corrupt patch.
53 test_expect_success
'apply detecting corrupt patch correctly' \
54 'git diff | sed -e 's
/-CIT/xCIT
/' >broken &&
55 if git apply --stat --summary broken 2>detected
57 echo unhappy - should have detected an error
62 detected=`cat detected` &&
63 detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
64 detected=`sed -ne "${detected}p" broken` &&
65 test "$detected" = xCIT'
67 test_expect_success
'apply detecting corrupt patch correctly' \
68 'git diff --binary | sed -e 's
/-CIT/xCIT
/' >broken &&
69 if git apply --stat --summary broken 2>detected
71 echo unhappy - should have detected an error
76 detected=`cat detected` &&
77 detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
78 detected=`sed -ne "${detected}p" broken` &&
79 test "$detected" = xCIT'
81 test_expect_success
'initial commit' 'git commit -a -m initial'
83 # Try removal (b), modification (d), and creation (e).
84 test_expect_success
'diff-index with --binary' \
85 'echo AIT >a && mv b e && echo CIT >c && cat e >d &&
86 git update-index --add --remove a b c d e &&
87 tree0=`git write-tree` &&
88 git diff --cached --binary >current &&
89 git apply --stat --summary current'
91 test_expect_success
'apply binary patch' \
93 git apply --binary --index <current &&
94 tree1=`git write-tree` &&
95 test "$tree1" = "$tree0"'
97 test_expect_success
'diff --no-index with binary creation' '
98 echo Q | q_to_nul >binary &&
99 (: hide error code from diff, which just indicates differences
100 git diff --binary --no-index /dev/null binary >current ||
104 git apply --binary <current &&
106 nul_to_q <binary >actual &&
107 test_cmp expected actual