blob: 0a8af76aabf5ad79193341d1ffd4be4c9d4cb7a6 [file] [log] [blame]
Junio C Hamano42d0ee82006-05-06 00:15:54 -07001#!/bin/sh
2#
3# Copyright (c) 2006 Junio C Hamano
4#
5
6test_description='Binary diff and apply
7'
8
9. ./test-lib.sh
10
Jonathan Nieder2983c0e2012-03-13 00:02:19 -050011cat >expect.binary-numstat <<\EOF
121 1 a
13- - b
141 1 c
15- - d
16EOF
17
Alexander Strasser1358bb42012-07-12 00:12:03 +020018test_expect_success 'prepare repository' '
Alexander Strasser3e9cdf72012-07-16 22:45:40 +020019 echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
20 git update-index --add a b c d &&
21 echo git >a &&
22 cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
23 echo git >c &&
24 cat b b >d
Alexander Strasser1358bb42012-07-12 00:12:03 +020025'
Junio C Hamano42d0ee82006-05-06 00:15:54 -070026
Eric Wongc7053aa2006-05-25 19:06:16 -070027cat > expected <<\EOF
Junio C Hamano42d0ee82006-05-06 00:15:54 -070028 a | 2 +-
29 b | Bin
30 c | 2 +-
31 d | Bin
32 4 files changed, 2 insertions(+), 2 deletions(-)
Eric Wongc7053aa2006-05-25 19:06:16 -070033EOF
Alexander Strasserbb84e672012-07-12 00:12:21 +020034test_expect_success 'apply --stat output for binary file change' '
Jonathan Nieder2983c0e2012-03-13 00:02:19 -050035 git diff >diff &&
36 git apply --stat --summary <diff >current &&
37 test_i18ncmp expected current
38'
Junio C Hamano42d0ee82006-05-06 00:15:54 -070039
Alexander Strasserde9658b2012-06-15 23:50:30 +020040test_expect_success 'diff --shortstat output for binary file change' '
Alexander Strasser216f25f2012-07-16 22:45:10 +020041 tail -n 1 expected >expect &&
Alexander Strasserde9658b2012-06-15 23:50:30 +020042 git diff --shortstat >current &&
Alexander Strasser216f25f2012-07-16 22:45:10 +020043 test_i18ncmp expect current
Alexander Strasserde9658b2012-06-15 23:50:30 +020044'
45
46test_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
50'
51
Jonathan Nieder2983c0e2012-03-13 00:02:19 -050052test_expect_success 'apply --numstat notices binary file change' '
53 git diff >diff &&
54 git apply --numstat <diff >current &&
55 test_cmp expect.binary-numstat current
56'
57
58test_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
62'
Junio C Hamano42d0ee82006-05-06 00:15:54 -070063
64# apply needs to be able to skip the binary material correctly
65# in order to report the line number of a corrupt patch.
Jiang Xin76638d92012-08-27 13:36:52 +080066test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '
Alexander Strasser3e9cdf72012-07-16 22:45:40 +020067 git diff >output &&
68 sed -e "s/-CIT/xCIT/" <output >broken &&
Alexander Strasserc7c0a252012-07-16 22:47:22 +020069 test_must_fail git apply --stat --summary broken 2>detected &&
Elia Pintoe6ce6f42014-04-30 09:22:58 -070070 detected=$(cat detected) &&
Christian Couderdae197f2016-08-08 23:03:04 +020071 detected=$(expr "$detected" : "error.*at line \\([0-9]*\\)\$") &&
Elia Pintoe6ce6f42014-04-30 09:22:58 -070072 detected=$(sed -ne "${detected}p" broken) &&
Alexander Strasser3e9cdf72012-07-16 22:45:40 +020073 test "$detected" = xCIT
Alexander Strasser1358bb42012-07-12 00:12:03 +020074'
Junio C Hamano42d0ee82006-05-06 00:15:54 -070075
Jiang Xin76638d92012-08-27 13:36:52 +080076test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '
Alexander Strasser3e9cdf72012-07-16 22:45:40 +020077 git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
Alexander Strasserc7c0a252012-07-16 22:47:22 +020078 test_must_fail git apply --stat --summary broken 2>detected &&
Elia Pintoe6ce6f42014-04-30 09:22:58 -070079 detected=$(cat detected) &&
Christian Couderdae197f2016-08-08 23:03:04 +020080 detected=$(expr "$detected" : "error.*at line \\([0-9]*\\)\$") &&
Elia Pintoe6ce6f42014-04-30 09:22:58 -070081 detected=$(sed -ne "${detected}p" broken) &&
Alexander Strasser3e9cdf72012-07-16 22:45:40 +020082 test "$detected" = xCIT
Alexander Strasser1358bb42012-07-12 00:12:03 +020083'
Junio C Hamano42d0ee82006-05-06 00:15:54 -070084
Nanako Shiraishi3604e7c2008-09-03 17:59:29 +090085test_expect_success 'initial commit' 'git commit -a -m initial'
Junio C Hamano42d0ee82006-05-06 00:15:54 -070086
87# Try removal (b), modification (d), and creation (e).
Alexander Strasser1358bb42012-07-12 00:12:03 +020088test_expect_success 'diff-index with --binary' '
Alexander Strasser3e9cdf72012-07-16 22:45:40 +020089 echo AIT >a && mv b e && echo CIT >c && cat e >d &&
90 git update-index --add --remove a b c d e &&
Elia Pintoe6ce6f42014-04-30 09:22:58 -070091 tree0=$(git write-tree) &&
Alexander Strasser3e9cdf72012-07-16 22:45:40 +020092 git diff --cached --binary >current &&
93 git apply --stat --summary current
Alexander Strasser1358bb42012-07-12 00:12:03 +020094'
Junio C Hamano42d0ee82006-05-06 00:15:54 -070095
Alexander Strasser1358bb42012-07-12 00:12:03 +020096test_expect_success 'apply binary patch' '
Alexander Strasser3e9cdf72012-07-16 22:45:40 +020097 git reset --hard &&
98 git apply --binary --index <current &&
Elia Pintoe6ce6f42014-04-30 09:22:58 -070099 tree1=$(git write-tree) &&
Alexander Strasser3e9cdf72012-07-16 22:45:40 +0200100 test "$tree1" = "$tree0"
Alexander Strasser1358bb42012-07-12 00:12:03 +0200101'
Junio C Hamano42d0ee82006-05-06 00:15:54 -0700102
Linus Torvalds71b989e2008-10-05 15:35:15 -0400103test_expect_success 'diff --no-index with binary creation' '
104 echo Q | q_to_nul >binary &&
Johannes Schindelin36adb4a2009-03-07 16:51:33 +0100105 (: hide error code from diff, which just indicates differences
Linus Torvalds71b989e2008-10-05 15:35:15 -0400106 git diff --binary --no-index /dev/null binary >current ||
107 true
108 ) &&
109 rm binary &&
110 git apply --binary <current &&
111 echo Q >expected &&
112 nul_to_q <binary >actual &&
113 test_cmp expected actual
114'
115
Zbigniew Jędrzejewski-Szmekdc801e72012-04-30 22:38:58 +0200116cat >expect <<EOF
117 binfile | Bin 0 -> 1026 bytes
118 textfile | 10000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
119EOF
120
121test_expect_success 'diff --stat with binary files and big change count' '
Johannes Sixt66fd93e2012-07-16 22:46:56 +0200122 printf "\01\00%1024d" 1 >binfile &&
Zbigniew Jędrzejewski-Szmekdc801e72012-04-30 22:38:58 +0200123 git add binfile &&
124 i=0 &&
125 while test $i -lt 10000; do
126 echo $i &&
127 i=$(($i + 1))
128 done >textfile &&
129 git add textfile &&
130 git diff --cached --stat binfile textfile >output &&
131 grep " | " output >actual &&
132 test_cmp expect actual
133'
134
Junio C Hamano42d0ee82006-05-06 00:15:54 -0700135test_done