]>
Commit | Line | Data |
---|---|---|
8884cf15 TR |
1 | #!/bin/sh |
2 | ||
3 | test_description='range-diff tests' | |
4 | ||
d6c6b108 | 5 | GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main |
334afbc7 JS |
6 | export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME |
7 | ||
8884cf15 TR |
8 | . ./test-lib.sh |
9 | ||
10 | # Note that because of the range-diff's heuristics, test_commit does more | |
11 | # harm than good. We need some real history. | |
12 | ||
13 | test_expect_success 'setup' ' | |
3a6e48e9 | 14 | git fast-import <"$TEST_DIRECTORY"/t3206/history.export && |
79f3950d | 15 | test_oid_cache <<-\EOF |
b561edd2 | 16 | # topic |
17 | t1 sha1:4de457d | |
18 | t2 sha1:fccce22 | |
19 | t3 sha1:147e64e | |
20 | t4 sha1:a63e992 | |
21 | t1 sha256:b89f8b9 | |
22 | t2 sha256:5f12aad | |
23 | t3 sha256:ea8b273 | |
24 | t4 sha256:14b7336 | |
25 | ||
26 | # unmodified | |
27 | u1 sha1:35b9b25 | |
28 | u2 sha1:de345ab | |
29 | u3 sha1:9af6654 | |
30 | u4 sha1:2901f77 | |
31 | u1 sha256:e3731be | |
32 | u2 sha256:14fadf8 | |
33 | u3 sha256:736c4bc | |
34 | u4 sha256:673e77d | |
35 | ||
2b15969f TL |
36 | # topic (abbrev=10) |
37 | t1_abbrev sha1:4de457d2c0 | |
38 | t2_abbrev sha1:fccce22f8c | |
39 | t3_abbrev sha1:147e64ef53 | |
40 | t4_abbrev sha1:a63e992599 | |
41 | t1_abbrev sha256:b89f8b9092 | |
42 | t2_abbrev sha256:5f12aadf34 | |
43 | t3_abbrev sha256:ea8b273a6c | |
44 | t4_abbrev sha256:14b73361fc | |
45 | ||
46 | # unmodified (abbrev=10) | |
47 | u1_abbrev sha1:35b9b25f76 | |
48 | u2_abbrev sha1:de345ab3de | |
49 | u3_abbrev sha1:9af6654000 | |
50 | u4_abbrev sha1:2901f773f3 | |
51 | u1_abbrev sha256:e3731be242 | |
52 | u2_abbrev sha256:14fadf8cee | |
53 | u3_abbrev sha256:736c4bcb44 | |
54 | u4_abbrev sha256:673e77d589 | |
55 | ||
b561edd2 | 56 | # reordered |
57 | r1 sha1:aca177a | |
58 | r2 sha1:14ad629 | |
59 | r3 sha1:ee58208 | |
60 | r4 sha1:307b27a | |
61 | r1 sha256:f59d3aa | |
62 | r2 sha256:fb261a8 | |
63 | r3 sha256:cb2649b | |
64 | r4 sha256:958577e | |
65 | ||
66 | # removed (deleted) | |
67 | d1 sha1:7657159 | |
68 | d2 sha1:43d84d3 | |
69 | d3 sha1:a740396 | |
70 | d1 sha256:e312513 | |
71 | d2 sha256:eb19258 | |
72 | d3 sha256:1ccb3c1 | |
73 | ||
74 | # added | |
75 | a1 sha1:2716022 | |
76 | a2 sha1:b62accd | |
77 | a3 sha1:df46cfa | |
78 | a4 sha1:3e64548 | |
79 | a5 sha1:12b4063 | |
80 | a1 sha256:d724f4d | |
81 | a2 sha256:1de7762 | |
82 | a3 sha256:e159431 | |
83 | a4 sha256:b3e483c | |
84 | a5 sha256:90866a7 | |
85 | ||
86 | # rebased | |
87 | b1 sha1:cc9c443 | |
88 | b2 sha1:c5d9641 | |
89 | b3 sha1:28cc2b6 | |
90 | b4 sha1:5628ab7 | |
91 | b5 sha1:a31b12e | |
92 | b1 sha256:a1a8717 | |
93 | b2 sha256:20a5862 | |
94 | b3 sha256:587172a | |
95 | b4 sha256:2721c5d | |
96 | b5 sha256:7b57864 | |
97 | ||
98 | # changed | |
99 | c1 sha1:a4b3333 | |
100 | c2 sha1:f51d370 | |
101 | c3 sha1:0559556 | |
102 | c4 sha1:d966c5c | |
103 | c1 sha256:f8c2b9d | |
104 | c2 sha256:3fb6318 | |
105 | c3 sha256:168ab68 | |
106 | c4 sha256:3526539 | |
107 | ||
108 | # changed-message | |
109 | m1 sha1:f686024 | |
110 | m2 sha1:4ab067d | |
111 | m3 sha1:b9cb956 | |
112 | m4 sha1:8add5f1 | |
113 | m1 sha256:31e6281 | |
114 | m2 sha256:a06bf1b | |
115 | m3 sha256:82dc654 | |
116 | m4 sha256:48470c5 | |
117 | ||
118 | # renamed | |
119 | n1 sha1:f258d75 | |
120 | n2 sha1:017b62d | |
121 | n3 sha1:3ce7af6 | |
122 | n4 sha1:1e6226b | |
123 | n1 sha256:ad52114 | |
124 | n2 sha256:3b54c8f | |
125 | n3 sha256:3b0a644 | |
126 | n4 sha256:e461653 | |
127 | ||
94db7e3e | 128 | # mode change |
129 | o1 sha1:4d39cb3 | |
130 | o2 sha1:26c107f | |
131 | o3 sha1:4c1e0f5 | |
132 | o1 sha256:d0dd598 | |
133 | o2 sha256:c4a279e | |
134 | o3 sha256:78459d7 | |
135 | ||
b561edd2 | 136 | # added and removed |
137 | s1 sha1:096b1ba | |
138 | s2 sha1:d92e698 | |
139 | s3 sha1:9a1db4d | |
140 | s4 sha1:fea3b5c | |
141 | s1 sha256:a7f9134 | |
142 | s2 sha256:b4c2580 | |
143 | s3 sha256:1d62aa2 | |
144 | s4 sha256:48160e8 | |
145 | ||
146 | # Empty delimiter (included so lines match neatly) | |
147 | __ sha1:------- | |
148 | __ sha256:------- | |
149 | EOF | |
8884cf15 TR |
150 | ' |
151 | ||
152 | test_expect_success 'simple A..B A..C (unmodified)' ' | |
d6c6b108 | 153 | git range-diff --no-color main..topic main..unmodified \ |
8884cf15 | 154 | >actual && |
75c5aa07 | 155 | cat >expect <<-EOF && |
b561edd2 | 156 | 1: $(test_oid t1) = 1: $(test_oid u1) s/5/A/ |
157 | 2: $(test_oid t2) = 2: $(test_oid u2) s/4/A/ | |
158 | 3: $(test_oid t3) = 3: $(test_oid u3) s/11/B/ | |
159 | 4: $(test_oid t4) = 4: $(test_oid u4) s/12/B/ | |
8884cf15 | 160 | EOF |
75c5aa07 | 161 | test_cmp expect actual |
8884cf15 TR |
162 | ' |
163 | ||
164 | test_expect_success 'simple B...C (unmodified)' ' | |
165 | git range-diff --no-color topic...unmodified >actual && | |
75c5aa07 DL |
166 | # same "expect" as above |
167 | test_cmp expect actual | |
8884cf15 TR |
168 | ' |
169 | ||
170 | test_expect_success 'simple A B C (unmodified)' ' | |
d6c6b108 | 171 | git range-diff --no-color main topic unmodified >actual && |
75c5aa07 DL |
172 | # same "expect" as above |
173 | test_cmp expect actual | |
8884cf15 TR |
174 | ' |
175 | ||
2b15969f TL |
176 | test_expect_success 'simple A..B A..C (unmodified) with --abbrev' ' |
177 | git range-diff --no-color --abbrev=10 main..topic main..unmodified \ | |
178 | >actual && | |
179 | cat >expect <<-EOF && | |
180 | 1: $(test_oid t1_abbrev) = 1: $(test_oid u1_abbrev) s/5/A/ | |
181 | 2: $(test_oid t2_abbrev) = 2: $(test_oid u2_abbrev) s/4/A/ | |
182 | 3: $(test_oid t3_abbrev) = 3: $(test_oid u3_abbrev) s/11/B/ | |
183 | 4: $(test_oid t4_abbrev) = 4: $(test_oid u4_abbrev) s/12/B/ | |
184 | EOF | |
185 | test_cmp expect actual | |
186 | ' | |
187 | ||
359f0d75 JS |
188 | test_expect_success 'A^! and A^-<n> (unmodified)' ' |
189 | git range-diff --no-color topic^! unmodified^-1 >actual && | |
190 | cat >expect <<-EOF && | |
191 | 1: $(test_oid t4) = 1: $(test_oid u4) s/12/B/ | |
192 | EOF | |
193 | test_cmp expect actual | |
194 | ' | |
195 | ||
196 | test_expect_success 'A^{/..} is not mistaken for a range' ' | |
b7574782 | 197 | test_must_fail git range-diff topic^.. topic^{/..} -- 2>error && |
6789275d | 198 | test_grep "not a commit range" error |
359f0d75 JS |
199 | ' |
200 | ||
8884cf15 | 201 | test_expect_success 'trivial reordering' ' |
d6c6b108 | 202 | git range-diff --no-color main topic reordered >actual && |
75c5aa07 | 203 | cat >expect <<-EOF && |
b561edd2 | 204 | 1: $(test_oid t1) = 1: $(test_oid r1) s/5/A/ |
205 | 3: $(test_oid t3) = 2: $(test_oid r2) s/11/B/ | |
206 | 4: $(test_oid t4) = 3: $(test_oid r3) s/12/B/ | |
207 | 2: $(test_oid t2) = 4: $(test_oid r4) s/4/A/ | |
8884cf15 | 208 | EOF |
75c5aa07 | 209 | test_cmp expect actual |
8884cf15 TR |
210 | ' |
211 | ||
212 | test_expect_success 'removed a commit' ' | |
d6c6b108 | 213 | git range-diff --no-color main topic removed >actual && |
75c5aa07 | 214 | cat >expect <<-EOF && |
b561edd2 | 215 | 1: $(test_oid t1) = 1: $(test_oid d1) s/5/A/ |
216 | 2: $(test_oid t2) < -: $(test_oid __) s/4/A/ | |
217 | 3: $(test_oid t3) = 2: $(test_oid d2) s/11/B/ | |
218 | 4: $(test_oid t4) = 3: $(test_oid d3) s/12/B/ | |
8884cf15 | 219 | EOF |
75c5aa07 | 220 | test_cmp expect actual |
8884cf15 TR |
221 | ' |
222 | ||
223 | test_expect_success 'added a commit' ' | |
d6c6b108 | 224 | git range-diff --no-color main topic added >actual && |
75c5aa07 | 225 | cat >expect <<-EOF && |
b561edd2 | 226 | 1: $(test_oid t1) = 1: $(test_oid a1) s/5/A/ |
227 | 2: $(test_oid t2) = 2: $(test_oid a2) s/4/A/ | |
228 | -: $(test_oid __) > 3: $(test_oid a3) s/6/A/ | |
229 | 3: $(test_oid t3) = 4: $(test_oid a4) s/11/B/ | |
230 | 4: $(test_oid t4) = 5: $(test_oid a5) s/12/B/ | |
8884cf15 | 231 | EOF |
75c5aa07 | 232 | test_cmp expect actual |
8884cf15 TR |
233 | ' |
234 | ||
235 | test_expect_success 'new base, A B C' ' | |
d6c6b108 | 236 | git range-diff --no-color main topic rebased >actual && |
75c5aa07 | 237 | cat >expect <<-EOF && |
b561edd2 | 238 | 1: $(test_oid t1) = 1: $(test_oid b1) s/5/A/ |
239 | 2: $(test_oid t2) = 2: $(test_oid b2) s/4/A/ | |
240 | 3: $(test_oid t3) = 3: $(test_oid b3) s/11/B/ | |
241 | 4: $(test_oid t4) = 4: $(test_oid b4) s/12/B/ | |
8884cf15 | 242 | EOF |
75c5aa07 | 243 | test_cmp expect actual |
8884cf15 TR |
244 | ' |
245 | ||
246 | test_expect_success 'new base, B...C' ' | |
d6c6b108 | 247 | # this syntax includes the commits from main! |
8884cf15 | 248 | git range-diff --no-color topic...rebased >actual && |
75c5aa07 | 249 | cat >expect <<-EOF && |
b561edd2 | 250 | -: $(test_oid __) > 1: $(test_oid b5) unrelated |
251 | 1: $(test_oid t1) = 2: $(test_oid b1) s/5/A/ | |
252 | 2: $(test_oid t2) = 3: $(test_oid b2) s/4/A/ | |
253 | 3: $(test_oid t3) = 4: $(test_oid b3) s/11/B/ | |
254 | 4: $(test_oid t4) = 5: $(test_oid b4) s/12/B/ | |
8884cf15 | 255 | EOF |
75c5aa07 | 256 | test_cmp expect actual |
8884cf15 TR |
257 | ' |
258 | ||
259 | test_expect_success 'changed commit' ' | |
260 | git range-diff --no-color topic...changed >actual && | |
75c5aa07 | 261 | cat >expect <<-EOF && |
b561edd2 | 262 | 1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/ |
263 | 2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/ | |
264 | 3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/ | |
499352c2 | 265 | @@ file: A |
8884cf15 TR |
266 | 9 |
267 | 10 | |
268 | -11 | |
269 | -+B | |
270 | ++BB | |
271 | 12 | |
272 | 13 | |
273 | 14 | |
b561edd2 | 274 | 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/ |
499352c2 | 275 | @@ file |
444e0969 | 276 | @@ file: A |
8884cf15 TR |
277 | 9 |
278 | 10 | |
279 | - B | |
280 | + BB | |
281 | -12 | |
282 | +B | |
283 | 13 | |
284 | EOF | |
75c5aa07 | 285 | test_cmp expect actual |
8884cf15 TR |
286 | ' |
287 | ||
4624185a ÆAB |
288 | test_expect_success 'changed commit with --no-patch diff option' ' |
289 | git range-diff --no-color --no-patch topic...changed >actual && | |
75c5aa07 | 290 | cat >expect <<-EOF && |
b561edd2 | 291 | 1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/ |
292 | 2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/ | |
293 | 3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/ | |
294 | 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/ | |
4624185a | 295 | EOF |
75c5aa07 | 296 | test_cmp expect actual |
4624185a ÆAB |
297 | ' |
298 | ||
299 | test_expect_success 'changed commit with --stat diff option' ' | |
4624185a | 300 | git range-diff --no-color --stat topic...changed >actual && |
75c5aa07 | 301 | cat >expect <<-EOF && |
b561edd2 | 302 | 1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/ |
b561edd2 | 303 | 2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/ |
b561edd2 | 304 | 3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/ |
ff0c7fa8 TGS |
305 | a => b | 2 +- |
306 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
b561edd2 | 307 | 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/ |
ff0c7fa8 TGS |
308 | a => b | 2 +- |
309 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
4624185a | 310 | EOF |
75c5aa07 | 311 | test_cmp expect actual |
4624185a ÆAB |
312 | ' |
313 | ||
0e573e8f LDM |
314 | test_expect_success 'changed commit with sm config' ' |
315 | git range-diff --no-color --submodule=log topic...changed >actual && | |
75c5aa07 | 316 | cat >expect <<-EOF && |
b561edd2 | 317 | 1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/ |
318 | 2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/ | |
319 | 3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/ | |
499352c2 | 320 | @@ file: A |
0e573e8f LDM |
321 | 9 |
322 | 10 | |
323 | -11 | |
324 | -+B | |
325 | ++BB | |
326 | 12 | |
327 | 13 | |
328 | 14 | |
b561edd2 | 329 | 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/ |
499352c2 | 330 | @@ file |
444e0969 | 331 | @@ file: A |
0e573e8f LDM |
332 | 9 |
333 | 10 | |
334 | - B | |
335 | + BB | |
336 | -12 | |
337 | +B | |
338 | 13 | |
339 | EOF | |
75c5aa07 | 340 | test_cmp expect actual |
0e573e8f LDM |
341 | ' |
342 | ||
b66885a3 TG |
343 | test_expect_success 'renamed file' ' |
344 | git range-diff --no-color --submodule=log topic...renamed-file >actual && | |
75c5aa07 | 345 | sed s/Z/\ /g >expect <<-EOF && |
b561edd2 | 346 | 1: $(test_oid t1) = 1: $(test_oid n1) s/5/A/ |
347 | 2: $(test_oid t2) ! 2: $(test_oid n2) s/4/A/ | |
499352c2 | 348 | @@ Metadata |
b66885a3 TG |
349 | ZAuthor: Thomas Rast <trast@inf.ethz.ch> |
350 | Z | |
499352c2 | 351 | Z ## Commit message ## |
b66885a3 TG |
352 | - s/4/A/ |
353 | + s/4/A/ + rename file | |
354 | Z | |
355 | - ## file ## | |
356 | + ## file => renamed-file ## | |
357 | Z@@ | |
358 | Z 1 | |
359 | Z 2 | |
b561edd2 | 360 | 3: $(test_oid t3) ! 3: $(test_oid n3) s/11/B/ |
499352c2 TG |
361 | @@ Metadata |
362 | Z ## Commit message ## | |
b66885a3 TG |
363 | Z s/11/B/ |
364 | Z | |
365 | - ## file ## | |
444e0969 | 366 | -@@ file: A |
b66885a3 | 367 | + ## renamed-file ## |
444e0969 | 368 | +@@ renamed-file: A |
b66885a3 TG |
369 | Z 8 |
370 | Z 9 | |
444e0969 | 371 | Z 10 |
b561edd2 | 372 | 4: $(test_oid t4) ! 4: $(test_oid n4) s/12/B/ |
499352c2 TG |
373 | @@ Metadata |
374 | Z ## Commit message ## | |
b66885a3 TG |
375 | Z s/12/B/ |
376 | Z | |
377 | - ## file ## | |
444e0969 | 378 | -@@ file: A |
b66885a3 | 379 | + ## renamed-file ## |
444e0969 | 380 | +@@ renamed-file: A |
b66885a3 TG |
381 | Z 9 |
382 | Z 10 | |
444e0969 | 383 | Z B |
b66885a3 | 384 | EOF |
75c5aa07 | 385 | test_cmp expect actual |
b66885a3 TG |
386 | ' |
387 | ||
2b6a9b13 TG |
388 | test_expect_success 'file with mode only change' ' |
389 | git range-diff --no-color --submodule=log topic...mode-only-change >actual && | |
75c5aa07 | 390 | sed s/Z/\ /g >expect <<-EOF && |
94db7e3e | 391 | 1: $(test_oid t2) ! 1: $(test_oid o1) s/4/A/ |
2b6a9b13 TG |
392 | @@ Metadata |
393 | ZAuthor: Thomas Rast <trast@inf.ethz.ch> | |
394 | Z | |
395 | Z ## Commit message ## | |
396 | - s/4/A/ | |
397 | + s/4/A/ + add other-file | |
398 | Z | |
399 | Z ## file ## | |
400 | Z@@ | |
401 | @@ file | |
402 | Z A | |
403 | Z 6 | |
404 | Z 7 | |
405 | + | |
406 | + ## other-file (new) ## | |
94db7e3e | 407 | 2: $(test_oid t3) ! 2: $(test_oid o2) s/11/B/ |
2b6a9b13 TG |
408 | @@ Metadata |
409 | ZAuthor: Thomas Rast <trast@inf.ethz.ch> | |
410 | Z | |
411 | Z ## Commit message ## | |
412 | - s/11/B/ | |
413 | + s/11/B/ + mode change other-file | |
414 | Z | |
415 | Z ## file ## | |
416 | Z@@ file: A | |
417 | @@ file: A | |
418 | Z 12 | |
419 | Z 13 | |
420 | Z 14 | |
421 | + | |
422 | + ## other-file (mode change 100644 => 100755) ## | |
94db7e3e | 423 | 3: $(test_oid t4) = 3: $(test_oid o3) s/12/B/ |
2b6a9b13 | 424 | EOF |
75c5aa07 | 425 | test_cmp expect actual |
2b6a9b13 TG |
426 | ' |
427 | ||
b66885a3 TG |
428 | test_expect_success 'file added and later removed' ' |
429 | git range-diff --no-color --submodule=log topic...added-removed >actual && | |
75c5aa07 | 430 | sed s/Z/\ /g >expect <<-EOF && |
b561edd2 | 431 | 1: $(test_oid t1) = 1: $(test_oid s1) s/5/A/ |
432 | 2: $(test_oid t2) ! 2: $(test_oid s2) s/4/A/ | |
499352c2 | 433 | @@ Metadata |
b66885a3 TG |
434 | ZAuthor: Thomas Rast <trast@inf.ethz.ch> |
435 | Z | |
499352c2 | 436 | Z ## Commit message ## |
b66885a3 TG |
437 | - s/4/A/ |
438 | + s/4/A/ + new-file | |
439 | Z | |
440 | Z ## file ## | |
441 | Z@@ | |
499352c2 | 442 | @@ file |
b66885a3 TG |
443 | Z A |
444 | Z 6 | |
445 | Z 7 | |
446 | + | |
447 | + ## new-file (new) ## | |
b561edd2 | 448 | 3: $(test_oid t3) ! 3: $(test_oid s3) s/11/B/ |
499352c2 | 449 | @@ Metadata |
b66885a3 TG |
450 | ZAuthor: Thomas Rast <trast@inf.ethz.ch> |
451 | Z | |
499352c2 | 452 | Z ## Commit message ## |
b66885a3 TG |
453 | - s/11/B/ |
454 | + s/11/B/ + remove file | |
455 | Z | |
456 | Z ## file ## | |
444e0969 | 457 | Z@@ file: A |
499352c2 | 458 | @@ file: A |
b66885a3 TG |
459 | Z 12 |
460 | Z 13 | |
461 | Z 14 | |
462 | + | |
463 | + ## new-file (deleted) ## | |
b561edd2 | 464 | 4: $(test_oid t4) = 4: $(test_oid s4) s/12/B/ |
b66885a3 | 465 | EOF |
75c5aa07 | 466 | test_cmp expect actual |
b66885a3 TG |
467 | ' |
468 | ||
51bbcda1 JH |
469 | test_expect_success 'no commits on one side' ' |
470 | git commit --amend -m "new message" && | |
d6c6b108 | 471 | git range-diff main HEAD@{1} HEAD |
51bbcda1 JH |
472 | ' |
473 | ||
8884cf15 TR |
474 | test_expect_success 'changed message' ' |
475 | git range-diff --no-color topic...changed-message >actual && | |
75c5aa07 | 476 | sed s/Z/\ /g >expect <<-EOF && |
b561edd2 | 477 | 1: $(test_oid t1) = 1: $(test_oid m1) s/5/A/ |
478 | 2: $(test_oid t2) ! 2: $(test_oid m2) s/4/A/ | |
499352c2 TG |
479 | @@ Metadata |
480 | Z ## Commit message ## | |
8884cf15 TR |
481 | Z s/4/A/ |
482 | Z | |
483 | + Also a silly comment here! | |
484 | + | |
b66885a3 TG |
485 | Z ## file ## |
486 | Z@@ | |
487 | Z 1 | |
b561edd2 | 488 | 3: $(test_oid t3) = 3: $(test_oid m3) s/11/B/ |
489 | 4: $(test_oid t4) = 4: $(test_oid m4) s/12/B/ | |
8884cf15 | 490 | EOF |
75c5aa07 | 491 | test_cmp expect actual |
8884cf15 TR |
492 | ' |
493 | ||
c5e64caa | 494 | test_expect_success 'dual-coloring' ' |
b561edd2 | 495 | sed -e "s|^:||" >expect <<-EOF && |
496 | :<YELLOW>1: $(test_oid c1) = 1: $(test_oid m1) s/5/A/<RESET> | |
497 | :<RED>2: $(test_oid c2) <RESET><YELLOW>!<RESET><GREEN> 2: $(test_oid m2)<RESET><YELLOW> s/4/A/<RESET> | |
499352c2 TG |
498 | : <REVERSE><CYAN>@@<RESET> <RESET>Metadata<RESET> |
499 | : ## Commit message ##<RESET> | |
c5e64caa SB |
500 | : s/4/A/<RESET> |
501 | : <RESET> | |
502 | : <REVERSE><GREEN>+<RESET><BOLD> Also a silly comment here!<RESET> | |
29ef759d | 503 | : <REVERSE><GREEN>+<RESET> |
b66885a3 TG |
504 | : ## file ##<RESET> |
505 | : <CYAN> @@<RESET> | |
506 | : 1<RESET> | |
b561edd2 | 507 | :<RED>3: $(test_oid c3) <RESET><YELLOW>!<RESET><GREEN> 3: $(test_oid m3)<RESET><YELLOW> s/11/B/<RESET> |
499352c2 | 508 | : <REVERSE><CYAN>@@<RESET> <RESET>file: A<RESET> |
c5e64caa SB |
509 | : 9<RESET> |
510 | : 10<RESET> | |
511 | : <RED> -11<RESET> | |
512 | : <REVERSE><RED>-<RESET><FAINT;GREEN>+BB<RESET> | |
513 | : <REVERSE><GREEN>+<RESET><BOLD;GREEN>+B<RESET> | |
514 | : 12<RESET> | |
515 | : 13<RESET> | |
516 | : 14<RESET> | |
b561edd2 | 517 | :<RED>4: $(test_oid c4) <RESET><YELLOW>!<RESET><GREEN> 4: $(test_oid m4)<RESET><YELLOW> s/12/B/<RESET> |
499352c2 | 518 | : <REVERSE><CYAN>@@<RESET> <RESET>file<RESET> |
444e0969 | 519 | : <CYAN> @@ file: A<RESET> |
c5e64caa SB |
520 | : 9<RESET> |
521 | : 10<RESET> | |
522 | : <REVERSE><RED>-<RESET><FAINT> BB<RESET> | |
523 | : <REVERSE><GREEN>+<RESET><BOLD> B<RESET> | |
524 | : <RED> -12<RESET> | |
525 | : <GREEN> +B<RESET> | |
526 | : 13<RESET> | |
527 | EOF | |
528 | git range-diff changed...changed-message --color --dual-color >actual.raw && | |
529 | test_decode_color >actual <actual.raw && | |
530 | test_cmp expect actual | |
531 | ' | |
532 | ||
d6c6b108 | 533 | for prev in topic main..topic |
31e2617a ES |
534 | do |
535 | test_expect_success "format-patch --range-diff=$prev" ' | |
ac0edf1f | 536 | git format-patch --cover-letter --range-diff=$prev \ |
d6c6b108 | 537 | main..unmodified >actual && |
ac0edf1f MÃ… |
538 | test_when_finished "rm 000?-*" && |
539 | test_line_count = 5 actual && | |
6789275d | 540 | test_grep "^Range-diff:$" 0000-* && |
ac0edf1f MÃ… |
541 | grep "= 1: .* s/5/A" 0000-* && |
542 | grep "= 2: .* s/4/A" 0000-* && | |
543 | grep "= 3: .* s/11/B" 0000-* && | |
544 | grep "= 4: .* s/12/B" 0000-* | |
31e2617a ES |
545 | ' |
546 | done | |
547 | ||
cdc067c3 | 548 | test_expect_success 'format-patch --range-diff as commentary' ' |
ac0edf1f MÃ… |
549 | git format-patch --range-diff=HEAD~1 HEAD~1 >actual && |
550 | test_when_finished "rm 0001-*" && | |
551 | test_line_count = 1 actual && | |
6789275d | 552 | test_grep "^Range-diff:$" 0001-* && |
ac0edf1f | 553 | grep "> 1: .* new message" 0001-* |
cdc067c3 DS |
554 | ' |
555 | ||
db91988a ZH |
556 | test_expect_success 'format-patch --range-diff reroll-count with a non-integer' ' |
557 | git format-patch --range-diff=HEAD~1 -v2.9 HEAD~1 >actual && | |
558 | test_when_finished "rm v2.9-0001-*" && | |
559 | test_line_count = 1 actual && | |
6789275d | 560 | test_grep "^Range-diff:$" v2.9-0001-* && |
db91988a ZH |
561 | grep "> 1: .* new message" v2.9-0001-* |
562 | ' | |
563 | ||
564 | test_expect_success 'format-patch --range-diff reroll-count with a integer' ' | |
565 | git format-patch --range-diff=HEAD~1 -v2 HEAD~1 >actual && | |
566 | test_when_finished "rm v2-0001-*" && | |
567 | test_line_count = 1 actual && | |
6789275d | 568 | test_grep "^Range-diff ..* v1:$" v2-0001-* && |
db91988a ZH |
569 | grep "> 1: .* new message" v2-0001-* |
570 | ' | |
571 | ||
572 | test_expect_success 'format-patch --range-diff with v0' ' | |
573 | git format-patch --range-diff=HEAD~1 -v0 HEAD~1 >actual && | |
574 | test_when_finished "rm v0-0001-*" && | |
575 | test_line_count = 1 actual && | |
6789275d | 576 | test_grep "^Range-diff:$" v0-0001-* && |
db91988a ZH |
577 | grep "> 1: .* new message" v0-0001-* |
578 | ' | |
579 | ||
937b76ed JS |
580 | test_expect_success 'range-diff overrides diff.noprefix internally' ' |
581 | git -c diff.noprefix=true range-diff HEAD^... | |
582 | ' | |
583 | ||
8cf51561 VD |
584 | test_expect_success 'basic with modified format.pretty with suffix' ' |
585 | git -c format.pretty="format:commit %H%d%n" range-diff \ | |
d6c6b108 | 586 | main..topic main..unmodified |
8cf51561 VD |
587 | ' |
588 | ||
589 | test_expect_success 'basic with modified format.pretty without "commit "' ' | |
590 | git -c format.pretty="format:%H%n" range-diff \ | |
d6c6b108 | 591 | main..topic main..unmodified |
8cf51561 VD |
592 | ' |
593 | ||
3bdbdfb7 DL |
594 | test_expect_success 'range-diff compares notes by default' ' |
595 | git notes add -m "topic note" topic && | |
596 | git notes add -m "unmodified note" unmodified && | |
597 | test_when_finished git notes remove topic unmodified && | |
d6c6b108 | 598 | git range-diff --no-color main..topic main..unmodified \ |
3bdbdfb7 DL |
599 | >actual && |
600 | sed s/Z/\ /g >expect <<-EOF && | |
601 | 1: $(test_oid t1) = 1: $(test_oid u1) s/5/A/ | |
602 | 2: $(test_oid t2) = 2: $(test_oid u2) s/4/A/ | |
603 | 3: $(test_oid t3) = 3: $(test_oid u3) s/11/B/ | |
604 | 4: $(test_oid t4) ! 4: $(test_oid u4) s/12/B/ | |
9f726e1b | 605 | @@ Commit message |
3bdbdfb7 | 606 | Z |
9f726e1b DL |
607 | Z |
608 | Z ## Notes ## | |
3bdbdfb7 DL |
609 | - topic note |
610 | + unmodified note | |
611 | Z | |
612 | Z ## file ## | |
613 | Z@@ file: A | |
614 | EOF | |
615 | test_cmp expect actual | |
616 | ' | |
617 | ||
bd361918 DL |
618 | test_expect_success 'range-diff with --no-notes' ' |
619 | git notes add -m "topic note" topic && | |
620 | git notes add -m "unmodified note" unmodified && | |
621 | test_when_finished git notes remove topic unmodified && | |
d6c6b108 | 622 | git range-diff --no-color --no-notes main..topic main..unmodified \ |
bd361918 DL |
623 | >actual && |
624 | cat >expect <<-EOF && | |
625 | 1: $(test_oid t1) = 1: $(test_oid u1) s/5/A/ | |
626 | 2: $(test_oid t2) = 2: $(test_oid u2) s/4/A/ | |
627 | 3: $(test_oid t3) = 3: $(test_oid u3) s/11/B/ | |
628 | 4: $(test_oid t4) = 4: $(test_oid u4) s/12/B/ | |
629 | EOF | |
630 | test_cmp expect actual | |
631 | ' | |
632 | ||
633 | test_expect_success 'range-diff with multiple --notes' ' | |
634 | git notes --ref=note1 add -m "topic note1" topic && | |
635 | git notes --ref=note1 add -m "unmodified note1" unmodified && | |
636 | test_when_finished git notes --ref=note1 remove topic unmodified && | |
637 | git notes --ref=note2 add -m "topic note2" topic && | |
638 | git notes --ref=note2 add -m "unmodified note2" unmodified && | |
639 | test_when_finished git notes --ref=note2 remove topic unmodified && | |
d6c6b108 | 640 | git range-diff --no-color --notes=note1 --notes=note2 main..topic main..unmodified \ |
bd361918 DL |
641 | >actual && |
642 | sed s/Z/\ /g >expect <<-EOF && | |
643 | 1: $(test_oid t1) = 1: $(test_oid u1) s/5/A/ | |
644 | 2: $(test_oid t2) = 2: $(test_oid u2) s/4/A/ | |
645 | 3: $(test_oid t3) = 3: $(test_oid u3) s/11/B/ | |
646 | 4: $(test_oid t4) ! 4: $(test_oid u4) s/12/B/ | |
647 | @@ Commit message | |
648 | Z | |
649 | Z | |
650 | Z ## Notes (note1) ## | |
651 | - topic note1 | |
652 | + unmodified note1 | |
653 | Z | |
654 | Z | |
655 | Z ## Notes (note2) ## | |
656 | - topic note2 | |
657 | + unmodified note2 | |
658 | Z | |
659 | Z ## file ## | |
660 | Z@@ file: A | |
661 | EOF | |
662 | test_cmp expect actual | |
663 | ' | |
664 | ||
2e0d30d9 KH |
665 | # `range-diff` should act like `log` with regards to notes |
666 | test_expect_success 'range-diff with --notes=custom does not show default notes' ' | |
667 | git notes add -m "topic note" topic && | |
668 | git notes add -m "unmodified note" unmodified && | |
669 | git notes --ref=custom add -m "topic note" topic && | |
670 | git notes --ref=custom add -m "unmodified note" unmodified && | |
671 | test_when_finished git notes remove topic unmodified && | |
672 | test_when_finished git notes --ref=custom remove topic unmodified && | |
673 | git range-diff --notes=custom main..topic main..unmodified \ | |
674 | >actual && | |
675 | ! grep "## Notes ##" actual && | |
676 | grep "## Notes (custom) ##" actual | |
677 | ' | |
678 | ||
5b583e6a | 679 | test_expect_success 'format-patch --range-diff does not compare notes by default' ' |
3bdbdfb7 DL |
680 | git notes add -m "topic note" topic && |
681 | git notes add -m "unmodified note" unmodified && | |
682 | test_when_finished git notes remove topic unmodified && | |
683 | git format-patch --cover-letter --range-diff=$prev \ | |
d6c6b108 | 684 | main..unmodified >actual && |
3bdbdfb7 DL |
685 | test_when_finished "rm 000?-*" && |
686 | test_line_count = 5 actual && | |
6789275d | 687 | test_grep "^Range-diff:$" 0000-* && |
3bdbdfb7 DL |
688 | grep "= 1: .* s/5/A" 0000-* && |
689 | grep "= 2: .* s/4/A" 0000-* && | |
690 | grep "= 3: .* s/11/B" 0000-* && | |
5b583e6a DL |
691 | grep "= 4: .* s/12/B" 0000-* && |
692 | ! grep "Notes" 0000-* && | |
693 | ! grep "note" 0000-* | |
694 | ' | |
695 | ||
2e0d30d9 KH |
696 | test_expect_success 'format-patch --notes=custom --range-diff only compares custom notes' ' |
697 | git notes add -m "topic note" topic && | |
698 | git notes --ref=custom add -m "topic note (custom)" topic && | |
699 | git notes add -m "unmodified note" unmodified && | |
700 | git notes --ref=custom add -m "unmodified note (custom)" unmodified && | |
701 | test_when_finished git notes remove topic unmodified && | |
702 | test_when_finished git notes --ref=custom remove topic unmodified && | |
703 | git format-patch --notes=custom --cover-letter --range-diff=$prev \ | |
704 | main..unmodified >actual && | |
705 | test_when_finished "rm 000?-*" && | |
706 | grep "## Notes (custom) ##" 0000-* && | |
707 | ! grep "## Notes ##" 0000-* | |
708 | ' | |
709 | ||
5b583e6a DL |
710 | test_expect_success 'format-patch --range-diff with --no-notes' ' |
711 | git notes add -m "topic note" topic && | |
712 | git notes add -m "unmodified note" unmodified && | |
713 | test_when_finished git notes remove topic unmodified && | |
714 | git format-patch --no-notes --cover-letter --range-diff=$prev \ | |
d6c6b108 | 715 | main..unmodified >actual && |
5b583e6a DL |
716 | test_when_finished "rm 000?-*" && |
717 | test_line_count = 5 actual && | |
6789275d | 718 | test_grep "^Range-diff:$" 0000-* && |
5b583e6a DL |
719 | grep "= 1: .* s/5/A" 0000-* && |
720 | grep "= 2: .* s/4/A" 0000-* && | |
721 | grep "= 3: .* s/11/B" 0000-* && | |
722 | grep "= 4: .* s/12/B" 0000-* && | |
723 | ! grep "Notes" 0000-* && | |
724 | ! grep "note" 0000-* | |
725 | ' | |
726 | ||
727 | test_expect_success 'format-patch --range-diff with --notes' ' | |
728 | git notes add -m "topic note" topic && | |
729 | git notes add -m "unmodified note" unmodified && | |
730 | test_when_finished git notes remove topic unmodified && | |
731 | git format-patch --notes --cover-letter --range-diff=$prev \ | |
d6c6b108 | 732 | main..unmodified >actual && |
5b583e6a DL |
733 | test_when_finished "rm 000?-*" && |
734 | test_line_count = 5 actual && | |
6789275d | 735 | test_grep "^Range-diff:$" 0000-* && |
5b583e6a DL |
736 | grep "= 1: .* s/5/A" 0000-* && |
737 | grep "= 2: .* s/4/A" 0000-* && | |
738 | grep "= 3: .* s/11/B" 0000-* && | |
3bdbdfb7 DL |
739 | grep "! 4: .* s/12/B" 0000-* && |
740 | sed s/Z/\ /g >expect <<-EOF && | |
9f726e1b | 741 | @@ Commit message |
3bdbdfb7 | 742 | Z |
9f726e1b DL |
743 | Z |
744 | Z ## Notes ## | |
3bdbdfb7 DL |
745 | - topic note |
746 | + unmodified note | |
747 | Z | |
748 | Z ## file ## | |
749 | Z@@ file: A | |
750 | EOF | |
9f726e1b | 751 | sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual && |
3bdbdfb7 DL |
752 | test_cmp expect actual |
753 | ' | |
754 | ||
828765df | 755 | test_expect_success 'format-patch --range-diff with format.notes config' ' |
5b583e6a DL |
756 | git notes add -m "topic note" topic && |
757 | git notes add -m "unmodified note" unmodified && | |
758 | test_when_finished git notes remove topic unmodified && | |
759 | test_config format.notes true && | |
760 | git format-patch --cover-letter --range-diff=$prev \ | |
d6c6b108 | 761 | main..unmodified >actual && |
5b583e6a DL |
762 | test_when_finished "rm 000?-*" && |
763 | test_line_count = 5 actual && | |
6789275d | 764 | test_grep "^Range-diff:$" 0000-* && |
5b583e6a DL |
765 | grep "= 1: .* s/5/A" 0000-* && |
766 | grep "= 2: .* s/4/A" 0000-* && | |
767 | grep "= 3: .* s/11/B" 0000-* && | |
768 | grep "! 4: .* s/12/B" 0000-* && | |
769 | sed s/Z/\ /g >expect <<-EOF && | |
770 | @@ Commit message | |
771 | Z | |
772 | Z | |
773 | Z ## Notes ## | |
774 | - topic note | |
775 | + unmodified note | |
776 | Z | |
777 | Z ## file ## | |
778 | Z@@ file: A | |
779 | EOF | |
780 | sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual && | |
781 | test_cmp expect actual | |
782 | ' | |
783 | ||
784 | test_expect_success 'format-patch --range-diff with multiple notes' ' | |
785 | git notes --ref=note1 add -m "topic note1" topic && | |
786 | git notes --ref=note1 add -m "unmodified note1" unmodified && | |
787 | test_when_finished git notes --ref=note1 remove topic unmodified && | |
788 | git notes --ref=note2 add -m "topic note2" topic && | |
789 | git notes --ref=note2 add -m "unmodified note2" unmodified && | |
790 | test_when_finished git notes --ref=note2 remove topic unmodified && | |
791 | git format-patch --notes=note1 --notes=note2 --cover-letter --range-diff=$prev \ | |
d6c6b108 | 792 | main..unmodified >actual && |
5b583e6a DL |
793 | test_when_finished "rm 000?-*" && |
794 | test_line_count = 5 actual && | |
6789275d | 795 | test_grep "^Range-diff:$" 0000-* && |
5b583e6a DL |
796 | grep "= 1: .* s/5/A" 0000-* && |
797 | grep "= 2: .* s/4/A" 0000-* && | |
798 | grep "= 3: .* s/11/B" 0000-* && | |
799 | grep "! 4: .* s/12/B" 0000-* && | |
800 | sed s/Z/\ /g >expect <<-EOF && | |
801 | @@ Commit message | |
802 | Z | |
803 | Z | |
804 | Z ## Notes (note1) ## | |
805 | - topic note1 | |
806 | + unmodified note1 | |
807 | Z | |
808 | Z | |
809 | Z ## Notes (note2) ## | |
810 | - topic note2 | |
811 | + unmodified note2 | |
812 | Z | |
813 | Z ## file ## | |
814 | Z@@ file: A | |
815 | EOF | |
816 | sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual && | |
817 | test_cmp expect actual | |
818 | ' | |
819 | ||
1e79f973 JS |
820 | test_expect_success '--left-only/--right-only' ' |
821 | git switch --orphan left-right && | |
822 | test_commit first && | |
823 | test_commit unmatched && | |
824 | test_commit common && | |
825 | git switch -C left-right first && | |
826 | git cherry-pick common && | |
827 | ||
828 | git range-diff -s --left-only ...common >actual && | |
829 | head_oid=$(git rev-parse --short HEAD) && | |
830 | common_oid=$(git rev-parse --short common) && | |
831 | echo "1: $head_oid = 2: $common_oid common" >expect && | |
832 | test_cmp expect actual | |
833 | ' | |
834 | ||
b7574782 JS |
835 | test_expect_success 'ranges with pathspecs' ' |
836 | git range-diff topic...mode-only-change -- other-file >actual && | |
837 | test_line_count = 2 actual && | |
838 | topic_oid=$(git rev-parse --short topic) && | |
839 | mode_change_oid=$(git rev-parse --short mode-only-change^) && | |
840 | file_change_oid=$(git rev-parse --short mode-only-change) && | |
841 | grep "$mode_change_oid" actual && | |
842 | ! grep "$file_change_oid" actual && | |
843 | ! grep "$topic_oid" actual | |
844 | ' | |
845 | ||
04b1f1fd PB |
846 | test_expect_success 'submodule changes are shown irrespective of diff.submodule' ' |
847 | git init sub-repo && | |
848 | test_commit -C sub-repo sub-first && | |
849 | sub_oid1=$(git -C sub-repo rev-parse HEAD) && | |
850 | test_commit -C sub-repo sub-second && | |
851 | sub_oid2=$(git -C sub-repo rev-parse HEAD) && | |
852 | test_commit -C sub-repo sub-third && | |
853 | sub_oid3=$(git -C sub-repo rev-parse HEAD) && | |
854 | ||
855 | git checkout -b main-sub topic && | |
541607d9 | 856 | git -c protocol.file.allow=always submodule add ./sub-repo sub && |
04b1f1fd PB |
857 | git -C sub checkout --detach sub-first && |
858 | git commit -m "add sub" sub && | |
859 | sup_oid1=$(git rev-parse --short HEAD) && | |
860 | git checkout -b topic-sub && | |
861 | git -C sub checkout sub-second && | |
862 | git commit -m "change sub" sub && | |
863 | sup_oid2=$(git rev-parse --short HEAD) && | |
864 | git checkout -b modified-sub main-sub && | |
865 | git -C sub checkout sub-third && | |
866 | git commit -m "change sub" sub && | |
867 | sup_oid3=$(git rev-parse --short HEAD) && | |
868 | sup_oid0=$(test_oid __) && | |
869 | ||
870 | test_config diff.submodule log && | |
871 | git range-diff topic topic-sub modified-sub >actual && | |
872 | cat >expect <<-EOF && | |
873 | 1: $sup_oid1 = 1: $sup_oid1 add sub | |
874 | 2: $sup_oid2 < -: $sup_oid0 change sub | |
875 | -: $sup_oid0 > 2: $sup_oid3 change sub | |
876 | EOF | |
877 | test_cmp expect actual && | |
878 | test_config diff.submodule diff && | |
879 | git range-diff topic topic-sub modified-sub >actual && | |
880 | git range-diff --creation-factor=100 topic topic-sub modified-sub >actual && | |
881 | cat >expect <<-EOF && | |
882 | 1: $sup_oid1 = 1: $sup_oid1 add sub | |
883 | 2: $sup_oid2 ! 2: $sup_oid3 change sub | |
884 | @@ Commit message | |
885 | ## sub ## | |
886 | @@ | |
887 | -Subproject commit $sub_oid1 | |
888 | -+Subproject commit $sub_oid2 | |
889 | ++Subproject commit $sub_oid3 | |
890 | EOF | |
891 | test_cmp expect actual && | |
892 | test_config diff.submodule diff && | |
893 | git range-diff --creation-factor=100 topic topic-sub modified-sub >actual && | |
894 | test_cmp expect actual | |
895 | ' | |
896 | ||
8884cf15 | 897 | test_done |