apply: update line lengths for --inaccurate-eof
[git/git.git] / t / t4107-apply-ignore-whitespace.sh
CommitLineData
86c91f91
GB
1#!/bin/sh
2#
3# Copyright (c) 2009 Giuseppe Bilotta
4#
5
6test_description='git-apply --ignore-whitespace.
7
8'
9. ./test-lib.sh
10
11# This primes main.c file that indents without using HT at all.
12# Various patches with HT and other spaces are attempted in the test.
13
14cat > patch1.patch <<\EOF
15diff --git a/main.c b/main.c
16new file mode 100644
17--- /dev/null
18+++ b/main.c
19@@ -0,0 +1,22 @@
20+#include <stdio.h>
21+
22+void print_int(int num);
23+int func(int num);
24+
25+int main() {
26+ int i;
27+
28+ for (i = 0; i < 10; i++) {
29+ print_int(func(i)); /* stuff */
30+ }
31+
32+ return 0;
33+}
34+
35+int func(int num) {
36+ return num * num;
37+}
38+
39+void print_int(int num) {
40+ printf("%d", num);
41+}
42EOF
43
44# Since whitespace is very significant and we want to prevent whitespace
45# mangling when creating this test from a patch, we protect 'fixable'
46# whitespace by replacing spaces with Z and replacing them at patch
47# creation time, hence the sed trick.
48
49# This patch will fail unless whitespace differences are being ignored
50
51sed -e 's/Z/ /g' > patch2.patch <<\EOF
52diff --git a/main.c b/main.c
53--- a/main.c
54+++ b/main.c
55@@ -10,6 +10,8 @@
56Z print_int(func(i)); /* stuff */
57Z }
58Z
59+ printf("\n");
60+
61Z return 0;
62Z}
63Z
64EOF
65
66# This patch will fail even if whitespace differences are being ignored,
67# because of the missing string at EOL. TODO: this testcase should be
68# improved by creating a line that has the same hash with and without
69# the final string.
70
71sed -e 's/Z/ /g' > patch3.patch <<\EOF
72diff --git a/main.c b/main.c
73--- a/main.c
74+++ b/main.c
75@@ -10,3 +10,4 @@
76Z for (i = 0; i < 10; i++) {
77Z print_int(func(i));Z
78+ /* stuff */
79Z }
80EOF
81
82# This patch will fail even if whitespace differences are being ignored,
83# because of the missing EOL at EOF.
84
85sed -e 's/Z/ /g' > patch4.patch <<\EOF
86diff --git a/main.c b/main.c
87--- a/main.c
88+++ b/main.c
89@@ -21,1 +21,1 @@
90- };Z
91\ No newline at end of file
92+ };
93EOF
94
95# This patch will fail unless whitespace differences are being ignored.
96
97sed -e 's/Z/ /g' > patch5.patch <<\EOF
98diff --git a/main.c b/main.c
99--- a/main.c
100+++ b/main.c
101@@ -2,2 +2,3 @@
102Z void print_int(int num);
103+ /* a comment */
104Z int func(int num);
105EOF
106
107# And this is how the final output should be. Patches introduce
108# HTs but the original SP indents are mostly kept.
109
110sed -e 's/T/ /g' > main.c.final <<\EOF
111#include <stdio.h>
112
113void print_int(int num);
86c91f91
GB
114int func(int num);
115
116int main() {
117 int i;
118
119 for (i = 0; i < 10; i++) {
120 print_int(func(i)); /* stuff */
121 }
122
123Tprintf("\n");
124
125 return 0;
126}
127
128int func(int num) {
129 return num * num;
130}
131
132void print_int(int num) {
133 printf("%d", num);
134}
135EOF
136
137test_expect_success 'file creation' '
5d59a401 138 git apply patch1.patch
86c91f91
GB
139'
140
141test_expect_success 'patch2 fails (retab)' '
5d59a401 142 test_must_fail git apply patch2.patch
86c91f91
GB
143'
144
145test_expect_success 'patch2 applies with --ignore-whitespace' '
5d59a401 146 git apply --ignore-whitespace patch2.patch
86c91f91
GB
147'
148
149test_expect_success 'patch2 reverse applies with --ignore-space-change' '
5d59a401 150 git apply -R --ignore-space-change patch2.patch
86c91f91
GB
151'
152
153git config apply.ignorewhitespace change
154
155test_expect_success 'patch2 applies (apply.ignorewhitespace = change)' '
14d3bb49
JH
156 git apply patch2.patch &&
157 test_cmp main.c.final main.c
86c91f91
GB
158'
159
160test_expect_success 'patch3 fails (missing string at EOL)' '
5d59a401 161 test_must_fail git apply patch3.patch
86c91f91
GB
162'
163
164test_expect_success 'patch4 fails (missing EOL at EOF)' '
5d59a401 165 test_must_fail git apply patch4.patch
86c91f91
GB
166'
167
14d3bb49
JH
168test_expect_success 'patch5 fails (leading whitespace differences matter)' '
169 test_must_fail git apply patch5.patch
86c91f91
GB
170'
171
172test_expect_success 're-create file (with --ignore-whitespace)' '
173 rm -f main.c &&
5d59a401 174 git apply patch1.patch
86c91f91
GB
175'
176
177test_expect_success 'patch5 fails (--no-ignore-whitespace)' '
5d59a401 178 test_must_fail git apply --no-ignore-whitespace patch5.patch
86c91f91
GB
179'
180
4855de12
RS
181test_expect_success 'apply --ignore-space-change --inaccurate-eof' '
182 echo 1 >file &&
183 git apply --ignore-space-change --inaccurate-eof <<-\EOF &&
184 diff --git a/file b/file
185 --- a/file
186 +++ b/file
187 @@ -1 +1 @@
188 -1
189 +2
190 EOF
191 printf 2 >expect &&
192 test_cmp expect file
193'
194
86c91f91 195test_done