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 &&
32 4 files changed
, 2 insertions
(+), 2 deletions
(-)
34 test_expect_success
'apply --stat output for binary file change' '
36 git apply --stat --summary <diff >current &&
37 test_i18ncmp expected current
40 test_expect_success
'diff --shortstat output for binary file change' '
41 echo " 4 files changed, 2 insertions(+), 2 deletions(-)" >expected &&
42 git diff --shortstat >current &&
43 test_i18ncmp expected current
46 test_expect_success
'diff --shortstat output for binary file change only' '
47 echo " 1 file changed, 0 insertions(+), 0 deletions(-)" >expected &&
48 git diff --shortstat -- b >current &&
49 test_i18ncmp expected current
52 test_expect_success
'apply --numstat notices binary file change' '
54 git apply --numstat <diff >current &&
55 test_cmp expect.binary-numstat current
58 test_expect_success
'apply --numstat understands diff --binary format' '
59 git diff --binary >diff &&
60 git apply --numstat <diff >current &&
61 test_cmp expect.binary-numstat current
64 # apply needs to be able to skip the binary material correctly
65 # in order to report the line number of a corrupt patch.
66 test_expect_success
'apply detecting corrupt patch correctly' '
67 git diff | sed -e 's
/-CIT/xCIT
/' >broken &&
68 if git apply --stat --summary broken 2>detected
70 echo unhappy - should have detected an error
75 detected=`cat detected` &&
76 detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
77 detected=`sed -ne "${detected}p" broken` &&
78 test "$detected" = xCIT
81 test_expect_success
'apply detecting corrupt patch correctly' '
82 git diff --binary | sed -e 's
/-CIT/xCIT
/' >broken &&
83 if git apply --stat --summary broken 2>detected
85 echo unhappy - should have detected an error
90 detected=`cat detected` &&
91 detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
92 detected=`sed -ne "${detected}p" broken` &&
93 test "$detected" = xCIT
96 test_expect_success
'initial commit' 'git commit -a -m initial'
98 # Try removal (b), modification (d), and creation (e).
99 test_expect_success
'diff-index with --binary' '
100 echo AIT >a && mv b e && echo CIT >c && cat e >d &&
101 git update-index --add --remove a b c d e &&
102 tree0=`git write-tree` &&
103 git diff --cached --binary >current &&
104 git apply --stat --summary current
107 test_expect_success
'apply binary patch' '
109 git apply --binary --index <current &&
110 tree1=`git write-tree` &&
111 test "$tree1" = "$tree0"
114 test_expect_success
'diff --no-index with binary creation' '
115 echo Q | q_to_nul >binary &&
116 (: hide error code from diff, which just indicates differences
117 git diff --binary --no-index /dev/null binary >current ||
121 git apply --binary <current &&
123 nul_to_q <binary >actual &&
124 test_cmp expected actual
128 binfile | Bin 0 -> 1026 bytes
129 textfile | 10000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
132 test_expect_success
'diff --stat with binary files and big change count' '
133 echo X | dd of=binfile bs=1k seek=1 &&
136 while test $i -lt 10000; do
141 git diff --cached --stat binfile textfile >output &&
142 grep " | " output >actual &&
143 test_cmp expect actual