blob: c64d9d2f405e1e43a2247d91ca0a1a35af7fbad4 [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
Ævar Arnfjörð Bjarmason16d4bd42021-10-31 00:24:19 +02009TEST_PASSES_SANITIZE_LEAK=true
Junio C Hamano42d0ee82006-05-06 00:15:54 -070010. ./test-lib.sh
11
Jonathan Nieder2983c0e2012-03-13 00:02:19 -050012cat >expect.binary-numstat <<\EOF
131 1 a
14- - b
151 1 c
16- - d
17EOF
18
Alexander Strasser1358bb42012-07-12 00:12:03 +020019test_expect_success 'prepare repository' '
Alexander Strasser3e9cdf72012-07-16 22:45:40 +020020 echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
21 git update-index --add a b c d &&
22 echo git >a &&
23 cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
24 echo git >c &&
25 cat b b >d
Alexander Strasser1358bb42012-07-12 00:12:03 +020026'
Junio C Hamano42d0ee82006-05-06 00:15:54 -070027
Eric Wongc7053aa2006-05-25 19:06:16 -070028cat > expected <<\EOF
Junio C Hamano42d0ee82006-05-06 00:15:54 -070029 a | 2 +-
30 b | Bin
31 c | 2 +-
32 d | Bin
33 4 files changed, 2 insertions(+), 2 deletions(-)
Eric Wongc7053aa2006-05-25 19:06:16 -070034EOF
Alexander Strasserbb84e672012-07-12 00:12:21 +020035test_expect_success 'apply --stat output for binary file change' '
Jonathan Nieder2983c0e2012-03-13 00:02:19 -050036 git diff >diff &&
37 git apply --stat --summary <diff >current &&
Ævar Arnfjörð Bjarmason1108cea2021-02-11 02:53:53 +010038 test_cmp expected current
Jonathan Nieder2983c0e2012-03-13 00:02:19 -050039'
Junio C Hamano42d0ee82006-05-06 00:15:54 -070040
Alexander Strasserde9658b2012-06-15 23:50:30 +020041test_expect_success 'diff --shortstat output for binary file change' '
Alexander Strasser216f25f2012-07-16 22:45:10 +020042 tail -n 1 expected >expect &&
Alexander Strasserde9658b2012-06-15 23:50:30 +020043 git diff --shortstat >current &&
Ævar Arnfjörð Bjarmason1108cea2021-02-11 02:53:53 +010044 test_cmp expect current
Alexander Strasserde9658b2012-06-15 23:50:30 +020045'
46
47test_expect_success 'diff --shortstat output for binary file change only' '
48 echo " 1 file changed, 0 insertions(+), 0 deletions(-)" >expected &&
49 git diff --shortstat -- b >current &&
Ævar Arnfjörð Bjarmason1108cea2021-02-11 02:53:53 +010050 test_cmp expected current
Alexander Strasserde9658b2012-06-15 23:50:30 +020051'
52
Jonathan Nieder2983c0e2012-03-13 00:02:19 -050053test_expect_success 'apply --numstat notices binary file change' '
54 git diff >diff &&
55 git apply --numstat <diff >current &&
56 test_cmp expect.binary-numstat current
57'
58
59test_expect_success 'apply --numstat understands diff --binary format' '
60 git diff --binary >diff &&
61 git apply --numstat <diff >current &&
62 test_cmp expect.binary-numstat current
63'
Junio C Hamano42d0ee82006-05-06 00:15:54 -070064
65# apply needs to be able to skip the binary material correctly
66# in order to report the line number of a corrupt patch.
Ævar Arnfjörð Bjarmasona926c4b2021-02-11 02:53:51 +010067test_expect_success 'apply detecting corrupt patch correctly' '
Alexander Strasser3e9cdf72012-07-16 22:45:40 +020068 git diff >output &&
69 sed -e "s/-CIT/xCIT/" <output >broken &&
Alexander Strasserc7c0a252012-07-16 22:47:22 +020070 test_must_fail git apply --stat --summary broken 2>detected &&
Elia Pintoe6ce6f42014-04-30 09:22:58 -070071 detected=$(cat detected) &&
Christian Couderdae197f2016-08-08 23:03:04 +020072 detected=$(expr "$detected" : "error.*at line \\([0-9]*\\)\$") &&
Elia Pintoe6ce6f42014-04-30 09:22:58 -070073 detected=$(sed -ne "${detected}p" broken) &&
Alexander Strasser3e9cdf72012-07-16 22:45:40 +020074 test "$detected" = xCIT
Alexander Strasser1358bb42012-07-12 00:12:03 +020075'
Junio C Hamano42d0ee82006-05-06 00:15:54 -070076
Ævar Arnfjörð Bjarmasona926c4b2021-02-11 02:53:51 +010077test_expect_success 'apply detecting corrupt patch correctly' '
Alexander Strasser3e9cdf72012-07-16 22:45:40 +020078 git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
Alexander Strasserc7c0a252012-07-16 22:47:22 +020079 test_must_fail git apply --stat --summary broken 2>detected &&
Elia Pintoe6ce6f42014-04-30 09:22:58 -070080 detected=$(cat detected) &&
Christian Couderdae197f2016-08-08 23:03:04 +020081 detected=$(expr "$detected" : "error.*at line \\([0-9]*\\)\$") &&
Elia Pintoe6ce6f42014-04-30 09:22:58 -070082 detected=$(sed -ne "${detected}p" broken) &&
Alexander Strasser3e9cdf72012-07-16 22:45:40 +020083 test "$detected" = xCIT
Alexander Strasser1358bb42012-07-12 00:12:03 +020084'
Junio C Hamano42d0ee82006-05-06 00:15:54 -070085
Nanako Shiraishi3604e7c2008-09-03 17:59:29 +090086test_expect_success 'initial commit' 'git commit -a -m initial'
Junio C Hamano42d0ee82006-05-06 00:15:54 -070087
88# Try removal (b), modification (d), and creation (e).
Alexander Strasser1358bb42012-07-12 00:12:03 +020089test_expect_success 'diff-index with --binary' '
Alexander Strasser3e9cdf72012-07-16 22:45:40 +020090 echo AIT >a && mv b e && echo CIT >c && cat e >d &&
91 git update-index --add --remove a b c d e &&
Elia Pintoe6ce6f42014-04-30 09:22:58 -070092 tree0=$(git write-tree) &&
Alexander Strasser3e9cdf72012-07-16 22:45:40 +020093 git diff --cached --binary >current &&
94 git apply --stat --summary current
Alexander Strasser1358bb42012-07-12 00:12:03 +020095'
Junio C Hamano42d0ee82006-05-06 00:15:54 -070096
Alexander Strasser1358bb42012-07-12 00:12:03 +020097test_expect_success 'apply binary patch' '
Alexander Strasser3e9cdf72012-07-16 22:45:40 +020098 git reset --hard &&
99 git apply --binary --index <current &&
Elia Pintoe6ce6f42014-04-30 09:22:58 -0700100 tree1=$(git write-tree) &&
Alexander Strasser3e9cdf72012-07-16 22:45:40 +0200101 test "$tree1" = "$tree0"
Alexander Strasser1358bb42012-07-12 00:12:03 +0200102'
Junio C Hamano42d0ee82006-05-06 00:15:54 -0700103
Linus Torvalds71b989e2008-10-05 15:35:15 -0400104test_expect_success 'diff --no-index with binary creation' '
105 echo Q | q_to_nul >binary &&
Eric Sunshine83279742018-07-01 20:23:41 -0400106 # hide error code from diff, which just indicates differences
107 test_might_fail git diff --binary --no-index /dev/null binary >current &&
Linus Torvalds71b989e2008-10-05 15:35:15 -0400108 rm binary &&
109 git apply --binary <current &&
110 echo Q >expected &&
111 nul_to_q <binary >actual &&
112 test_cmp expected actual
113'
114
Zbigniew Jędrzejewski-Szmekdc801e72012-04-30 22:38:58 +0200115cat >expect <<EOF
Torsten Bögershausen12fc4ad2022-09-14 17:13:33 +0200116 binfilë | Bin 0 -> 1026 bytes
117 tëxtfilë | 10000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Zbigniew Jędrzejewski-Szmekdc801e72012-04-30 22:38:58 +0200118EOF
119
120test_expect_success 'diff --stat with binary files and big change count' '
Torsten Bögershausen12fc4ad2022-09-14 17:13:33 +0200121 printf "\01\00%1024d" 1 >binfilë &&
122 git add binfilë &&
Zbigniew Jędrzejewski-Szmekdc801e72012-04-30 22:38:58 +0200123 i=0 &&
124 while test $i -lt 10000; do
125 echo $i &&
Eric Sunshinecbe1d9d2021-12-09 00:11:13 -0500126 i=$(($i + 1)) || return 1
Torsten Bögershausen12fc4ad2022-09-14 17:13:33 +0200127 done >tëxtfilë &&
128 git add tëxtfilë &&
129 git -c core.quotepath=false diff --cached --stat binfilë tëxtfilë >output &&
Zbigniew Jędrzejewski-Szmekdc801e72012-04-30 22:38:58 +0200130 grep " | " output >actual &&
131 test_cmp expect actual
132'
133
Junio C Hamano42d0ee82006-05-06 00:15:54 -0700134test_done