]> git.ipfire.org Git - thirdparty/git.git/blame - t/t4205-log-pretty-formats.sh
The sixth batch
[thirdparty/git.git] / t / t4205-log-pretty-formats.sh
CommitLineData
8028184e
WP
1#!/bin/sh
2#
3# Copyright (c) 2010, Will Palmer
de6029a2 4# Copyright (c) 2011, Alexey Shumkin (+ non-UTF-8 commit encoding tests)
8028184e
WP
5#
6
7test_description='Test pretty formats'
8. ./test-lib.sh
9
ee3efaf6
AS
10# Tested non-UTF-8 encoding
11test_encoding="ISO8859-1"
12
37eb772e
AS
13sample_utf8_part=$(printf "f\303\244ng")
14
de6029a2 15commit_msg () {
17cc2ef1
AS
16 # String "initial. initial" partly in German
17 # (translated with Google Translate),
de6029a2 18 # encoded in UTF-8, used as a commit log message below.
37eb772e 19 msg="initial. an${sample_utf8_part}lich\n"
de6029a2
AS
20 if test -n "$1"
21 then
37eb772e
AS
22 printf "$msg" | iconv -f utf-8 -t "$1"
23 else
24 printf "$msg"
de6029a2 25 fi
de6029a2
AS
26}
27
8028184e
WP
28test_expect_success 'set up basic repos' '
29 >foo &&
30 >bar &&
31 git add foo &&
32 test_tick &&
ee3efaf6 33 git config i18n.commitEncoding $test_encoding &&
e6ce2be2 34 commit_msg $test_encoding | git commit -F - &&
8028184e
WP
35 git add bar &&
36 test_tick &&
de6029a2
AS
37 git commit -m "add bar" &&
38 git config --unset i18n.commitEncoding
8028184e
WP
39'
40
41test_expect_success 'alias builtin format' '
42 git log --pretty=oneline >expected &&
43 git config pretty.test-alias oneline &&
44 git log --pretty=test-alias >actual &&
45 test_cmp expected actual
46'
47
48test_expect_success 'alias masking builtin format' '
49 git log --pretty=oneline >expected &&
50 git config pretty.oneline "%H" &&
51 git log --pretty=oneline >actual &&
52 test_cmp expected actual
53'
54
55test_expect_success 'alias user-defined format' '
56 git log --pretty="format:%h" >expected &&
57 git config pretty.test-alias "format:%h" &&
58 git log --pretty=test-alias >actual &&
59 test_cmp expected actual
60'
61
ee3efaf6
AS
62test_expect_success 'alias user-defined tformat with %s (ISO8859-1 encoding)' '
63 git config i18n.logOutputEncoding $test_encoding &&
de6029a2
AS
64 git log --oneline >expected-s &&
65 git log --pretty="tformat:%h %s" >actual-s &&
66 git config --unset i18n.logOutputEncoding &&
67 test_cmp expected-s actual-s
68'
69
ecaee805 70test_expect_success 'alias user-defined tformat with %s (utf-8 encoding)' '
de6029a2
AS
71 git log --oneline >expected-s &&
72 git log --pretty="tformat:%h %s" >actual-s &&
73 test_cmp expected-s actual-s
74'
75
8028184e
WP
76test_expect_success 'alias user-defined tformat' '
77 git log --pretty="tformat:%h" >expected &&
78 git config pretty.test-alias "tformat:%h" &&
79 git log --pretty=test-alias >actual &&
80 test_cmp expected actual
81'
82
7be8b3ba 83test_expect_success 'alias non-existent format' '
8028184e
WP
84 git config pretty.test-alias format-that-will-never-exist &&
85 test_must_fail git log --pretty=test-alias
86'
87
88test_expect_success 'alias of an alias' '
89 git log --pretty="tformat:%h" >expected &&
90 git config pretty.test-foo "tformat:%h" &&
91 git config pretty.test-bar test-foo &&
92 git log --pretty=test-bar >actual && test_cmp expected actual
93'
94
95test_expect_success 'alias masking an alias' '
96 git log --pretty=format:"Two %H" >expected &&
97 git config pretty.duplicate "format:One %H" &&
98 git config --add pretty.duplicate "format:Two %H" &&
99 git log --pretty=duplicate >actual &&
100 test_cmp expected actual
101'
102
103test_expect_success 'alias loop' '
104 git config pretty.test-foo test-bar &&
105 git config pretty.test-bar test-foo &&
106 test_must_fail git log --pretty=test-foo
107'
108
ecaee805 109test_expect_success 'NUL separation' '
de6029a2 110 printf "add bar\0$(commit_msg)" >expected &&
3e065308
JK
111 git log -z --pretty="format:%s" >actual &&
112 test_cmp expected actual
113'
114
ecaee805 115test_expect_success 'NUL termination' '
de6029a2 116 printf "add bar\0$(commit_msg)\0" >expected &&
3e065308
JK
117 git log -z --pretty="tformat:%s" >actual &&
118 test_cmp expected actual
119'
120
ecaee805 121test_expect_success 'NUL separation with --stat' '
fafd3829 122 stat0_part=$(git diff --stat HEAD^ HEAD) &&
74faaa16 123 stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&
de6029a2 124 printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n" >expected &&
fafd3829 125 git log -z --stat --pretty="format:%s" >actual &&
b354f11b 126 test_i18ncmp expected actual
fafd3829
JH
127'
128
0d75bfe6 129test_expect_failure C_LOCALE_OUTPUT 'NUL termination with --stat' '
fafd3829 130 stat0_part=$(git diff --stat HEAD^ HEAD) &&
74faaa16 131 stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&
de6029a2 132 printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n0" >expected &&
fafd3829 133 git log -z --stat --pretty="tformat:%s" >actual &&
0d75bfe6 134 test_cmp expected actual
fafd3829
JH
135'
136
ac52d941
DL
137for p in short medium full fuller email raw
138do
139 test_expect_success "NUL termination with --reflog --pretty=$p" '
140 revs="$(git rev-list --reflog)" &&
141 for r in $revs
142 do
143 git show -s "$r" --pretty="$p" &&
144 printf "\0" || return 1
145 done >expect &&
146 {
147 git log -z --reflog --pretty="$p" &&
148 printf "\0"
149 } >actual &&
150 test_cmp expect actual
151 '
152done
153
154test_expect_success 'NUL termination with --reflog --pretty=oneline' '
155 revs="$(git rev-list --reflog)" &&
156 for r in $revs
157 do
158 git show -s --pretty=oneline "$r" >raw &&
159 cat raw | lf_to_nul || exit 1
160 done >expect &&
161 # the trailing NUL is already produced so we do not need to
162 # output another one
163 git log -z --pretty=oneline --reflog >actual &&
164 test_cmp expect actual
165'
166
a5752342
NTND
167test_expect_success 'setup more commits' '
168 test_commit "message one" one one message-one &&
a742f2a0
AS
169 test_commit "message two" two two message-two &&
170 head1=$(git rev-parse --verify --short HEAD~0) &&
171 head2=$(git rev-parse --verify --short HEAD~1) &&
172 head3=$(git rev-parse --verify --short HEAD~2) &&
173 head4=$(git rev-parse --verify --short HEAD~3)
a5752342
NTND
174'
175
f3445f78 176test_expect_success 'left alignment formatting' '
c82134a9 177 git log --pretty="tformat:%<(40)%s" >actual &&
9d1ca1da
JK
178 qz_to_tab_space <<-EOF >expected &&
179 message two Z
180 message one Z
181 add bar Z
182 $(commit_msg) Z
183 EOF
a5752342 184 test_cmp expected actual
f3445f78 185'
a5752342 186
d928d810
AS
187test_expect_success 'left alignment formatting. i18n.logOutputEncoding' '
188 git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(40)%s" >actual &&
9d1ca1da
JK
189 qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
190 message two Z
191 message one Z
192 add bar Z
193 $(commit_msg) Z
194 EOF
d928d810
AS
195 test_cmp expected actual
196'
197
f3445f78 198test_expect_success 'left alignment formatting at the nth column' '
c82134a9 199 git log --pretty="tformat:%h %<|(40)%s" >actual &&
9d1ca1da
JK
200 qz_to_tab_space <<-EOF >expected &&
201 $head1 message two Z
202 $head2 message one Z
203 $head3 add bar Z
204 $head4 $(commit_msg) Z
205 EOF
a5752342 206 test_cmp expected actual
f3445f78 207'
a5752342 208
066790d7
NTND
209test_expect_success 'left alignment formatting at the nth column' '
210 COLUMNS=50 git log --pretty="tformat:%h %<|(-10)%s" >actual &&
9d1ca1da
JK
211 qz_to_tab_space <<-EOF >expected &&
212 $head1 message two Z
213 $head2 message one Z
214 $head3 add bar Z
215 $head4 $(commit_msg) Z
216 EOF
066790d7
NTND
217 test_cmp expected actual
218'
219
d928d810
AS
220test_expect_success 'left alignment formatting at the nth column. i18n.logOutputEncoding' '
221 git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%h %<|(40)%s" >actual &&
9d1ca1da
JK
222 qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
223 $head1 message two Z
224 $head2 message one Z
225 $head3 add bar Z
226 $head4 $(commit_msg) Z
227 EOF
d928d810
AS
228 test_cmp expected actual
229'
230
f3445f78 231test_expect_success 'left alignment formatting with no padding' '
c82134a9 232 git log --pretty="tformat:%<(1)%s" >actual &&
9d1ca1da
JK
233 cat <<-EOF >expected &&
234 message two
235 message one
236 add bar
237 $(commit_msg)
238 EOF
a5752342 239 test_cmp expected actual
f3445f78 240'
a5752342 241
d928d810
AS
242test_expect_success 'left alignment formatting with no padding. i18n.logOutputEncoding' '
243 git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(1)%s" >actual &&
9d1ca1da
JK
244 cat <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
245 message two
246 message one
247 add bar
248 $(commit_msg)
249 EOF
d928d810
AS
250 test_cmp expected actual
251'
252
f3445f78 253test_expect_success 'left alignment formatting with trunc' '
c82134a9 254 git log --pretty="tformat:%<(10,trunc)%s" >actual &&
9d1ca1da
JK
255 qz_to_tab_space <<-\EOF >expected &&
256 message ..
257 message ..
258 add bar Z
259 initial...
260 EOF
a7f01c6b 261 test_cmp expected actual
f3445f78 262'
a7f01c6b 263
7d509878 264test_expect_success 'left alignment formatting with trunc. i18n.logOutputEncoding' '
d928d810 265 git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(10,trunc)%s" >actual &&
9d1ca1da
JK
266 qz_to_tab_space <<-\EOF | iconv -f utf-8 -t $test_encoding >expected &&
267 message ..
268 message ..
269 add bar Z
270 initial...
271 EOF
d928d810
AS
272 test_cmp expected actual
273'
274
f3445f78 275test_expect_success 'left alignment formatting with ltrunc' '
c82134a9 276 git log --pretty="tformat:%<(10,ltrunc)%s" >actual &&
9d1ca1da
JK
277 qz_to_tab_space <<-EOF >expected &&
278 ..sage two
279 ..sage one
280 add bar Z
281 ..${sample_utf8_part}lich
282 EOF
a7f01c6b 283 test_cmp expected actual
f3445f78 284'
a7f01c6b 285
7d509878 286test_expect_success 'left alignment formatting with ltrunc. i18n.logOutputEncoding' '
d928d810 287 git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(10,ltrunc)%s" >actual &&
9d1ca1da
JK
288 qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
289 ..sage two
290 ..sage one
291 add bar Z
292 ..${sample_utf8_part}lich
293 EOF
d928d810
AS
294 test_cmp expected actual
295'
296
f3445f78 297test_expect_success 'left alignment formatting with mtrunc' '
c82134a9 298 git log --pretty="tformat:%<(10,mtrunc)%s" >actual &&
9d1ca1da
JK
299 qz_to_tab_space <<-\EOF >expected &&
300 mess.. two
301 mess.. one
302 add bar Z
303 init..lich
304 EOF
a7f01c6b 305 test_cmp expected actual
f3445f78 306'
a7f01c6b 307
7d509878 308test_expect_success 'left alignment formatting with mtrunc. i18n.logOutputEncoding' '
d928d810 309 git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(10,mtrunc)%s" >actual &&
9d1ca1da
JK
310 qz_to_tab_space <<-\EOF | iconv -f utf-8 -t $test_encoding >expected &&
311 mess.. two
312 mess.. one
313 add bar Z
314 init..lich
315 EOF
d928d810
AS
316 test_cmp expected actual
317'
318
f3445f78 319test_expect_success 'right alignment formatting' '
c82134a9 320 git log --pretty="tformat:%>(40)%s" >actual &&
9d1ca1da
JK
321 qz_to_tab_space <<-EOF >expected &&
322 Z message two
323 Z message one
324 Z add bar
325 Z $(commit_msg)
326 EOF
a5752342 327 test_cmp expected actual
f3445f78 328'
a5752342 329
d928d810
AS
330test_expect_success 'right alignment formatting. i18n.logOutputEncoding' '
331 git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%>(40)%s" >actual &&
9d1ca1da
JK
332 qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
333 Z message two
334 Z message one
335 Z add bar
336 Z $(commit_msg)
337 EOF
d928d810
AS
338 test_cmp expected actual
339'
340
f3445f78 341test_expect_success 'right alignment formatting at the nth column' '
c82134a9 342 git log --pretty="tformat:%h %>|(40)%s" >actual &&
9d1ca1da
JK
343 qz_to_tab_space <<-EOF >expected &&
344 $head1 message two
345 $head2 message one
346 $head3 add bar
347 $head4 $(commit_msg)
348 EOF
a5752342 349 test_cmp expected actual
f3445f78 350'
a5752342 351
066790d7
NTND
352test_expect_success 'right alignment formatting at the nth column' '
353 COLUMNS=50 git log --pretty="tformat:%h %>|(-10)%s" >actual &&
9d1ca1da
JK
354 qz_to_tab_space <<-EOF >expected &&
355 $head1 message two
356 $head2 message one
357 $head3 add bar
358 $head4 $(commit_msg)
359 EOF
066790d7
NTND
360 test_cmp expected actual
361'
362
d928d810
AS
363test_expect_success 'right alignment formatting at the nth column. i18n.logOutputEncoding' '
364 git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%h %>|(40)%s" >actual &&
9d1ca1da
JK
365 qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
366 $head1 message two
367 $head2 message one
368 $head3 add bar
369 $head4 $(commit_msg)
370 EOF
d928d810
AS
371 test_cmp expected actual
372'
373
3ad87c80
JK
374# Note: Space between 'message' and 'two' should be in the same column
375# as in previous test.
376test_expect_success 'right alignment formatting at the nth column with --graph. i18n.logOutputEncoding' '
377 git -c i18n.logOutputEncoding=$test_encoding log --graph --pretty="tformat:%h %>|(40)%s" >actual &&
9d1ca1da
JK
378 iconv -f utf-8 -t $test_encoding >expected <<-EOF &&
379 * $head1 message two
380 * $head2 message one
381 * $head3 add bar
382 * $head4 $(commit_msg)
383 EOF
3ad87c80
JK
384 test_cmp expected actual
385'
386
f3445f78 387test_expect_success 'right alignment formatting with no padding' '
c82134a9 388 git log --pretty="tformat:%>(1)%s" >actual &&
9d1ca1da
JK
389 cat <<-EOF >expected &&
390 message two
391 message one
392 add bar
393 $(commit_msg)
394 EOF
a5752342 395 test_cmp expected actual
f3445f78 396'
a5752342 397
3ad87c80
JK
398test_expect_success 'right alignment formatting with no padding and with --graph' '
399 git log --graph --pretty="tformat:%>(1)%s" >actual &&
9d1ca1da
JK
400 cat <<-EOF >expected &&
401 * message two
402 * message one
403 * add bar
404 * $(commit_msg)
405 EOF
3ad87c80
JK
406 test_cmp expected actual
407'
408
d928d810
AS
409test_expect_success 'right alignment formatting with no padding. i18n.logOutputEncoding' '
410 git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%>(1)%s" >actual &&
9d1ca1da
JK
411 cat <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
412 message two
413 message one
414 add bar
415 $(commit_msg)
416 EOF
d928d810
AS
417 test_cmp expected actual
418'
419
f3445f78 420test_expect_success 'center alignment formatting' '
c82134a9 421 git log --pretty="tformat:%><(40)%s" >actual &&
9d1ca1da
JK
422 qz_to_tab_space <<-EOF >expected &&
423 Z message two Z
424 Z message one Z
425 Z add bar Z
426 Z $(commit_msg) Z
427 EOF
a5752342 428 test_cmp expected actual
f3445f78 429'
a5752342 430
d928d810
AS
431test_expect_success 'center alignment formatting. i18n.logOutputEncoding' '
432 git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%><(40)%s" >actual &&
9d1ca1da
JK
433 qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
434 Z message two Z
435 Z message one Z
436 Z add bar Z
437 Z $(commit_msg) Z
438 EOF
d928d810
AS
439 test_cmp expected actual
440'
f3445f78 441test_expect_success 'center alignment formatting at the nth column' '
c82134a9 442 git log --pretty="tformat:%h %><|(40)%s" >actual &&
9d1ca1da
JK
443 qz_to_tab_space <<-EOF >expected &&
444 $head1 message two Z
445 $head2 message one Z
446 $head3 add bar Z
447 $head4 $(commit_msg) Z
448 EOF
a5752342 449 test_cmp expected actual
f3445f78 450'
a5752342 451
066790d7
NTND
452test_expect_success 'center alignment formatting at the nth column' '
453 COLUMNS=70 git log --pretty="tformat:%h %><|(-30)%s" >actual &&
9d1ca1da
JK
454 qz_to_tab_space <<-EOF >expected &&
455 $head1 message two Z
456 $head2 message one Z
457 $head3 add bar Z
458 $head4 $(commit_msg) Z
459 EOF
066790d7
NTND
460 test_cmp expected actual
461'
462
d928d810
AS
463test_expect_success 'center alignment formatting at the nth column. i18n.logOutputEncoding' '
464 git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%h %><|(40)%s" >actual &&
9d1ca1da
JK
465 qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
466 $head1 message two Z
467 $head2 message one Z
468 $head3 add bar Z
469 $head4 $(commit_msg) Z
470 EOF
d928d810
AS
471 test_cmp expected actual
472'
473
f3445f78 474test_expect_success 'center alignment formatting with no padding' '
c82134a9 475 git log --pretty="tformat:%><(1)%s" >actual &&
9d1ca1da
JK
476 cat <<-EOF >expected &&
477 message two
478 message one
479 add bar
480 $(commit_msg)
481 EOF
a5752342 482 test_cmp expected actual
f3445f78 483'
a5752342 484
496a6980
AS
485# save HEAD's SHA-1 digest (with no abbreviations) to use it below
486# as far as the next test amends HEAD
487old_head1=$(git rev-parse --verify HEAD~0)
d928d810
AS
488test_expect_success 'center alignment formatting with no padding. i18n.logOutputEncoding' '
489 git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%><(1)%s" >actual &&
9d1ca1da
JK
490 cat <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
491 message two
492 message one
493 add bar
494 $(commit_msg)
495 EOF
d928d810
AS
496 test_cmp expected actual
497'
496a6980 498
f3445f78
AS
499test_expect_success 'left/right alignment formatting with stealing' '
500 git commit --amend -m short --author "long long long <long@me.com>" &&
c82134a9 501 git log --pretty="tformat:%<(10,trunc)%s%>>(10,ltrunc)% an" >actual &&
9d1ca1da
JK
502 cat <<-\EOF >expected &&
503 short long long long
504 message .. A U Thor
505 add bar A U Thor
506 initial... A U Thor
507 EOF
1640632b 508 test_cmp expected actual
f3445f78 509'
7d509878 510test_expect_success 'left/right alignment formatting with stealing. i18n.logOutputEncoding' '
d928d810 511 git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(10,trunc)%s%>>(10,ltrunc)% an" >actual &&
9d1ca1da
JK
512 cat <<-\EOF | iconv -f utf-8 -t $test_encoding >expected &&
513 short long long long
514 message .. A U Thor
515 add bar A U Thor
516 initial... A U Thor
517 EOF
d928d810
AS
518 test_cmp expected actual
519'
1640632b 520
43087596
NTND
521test_expect_success 'strbuf_utf8_replace() not producing NUL' '
522 git log --color --pretty="tformat:%<(10,trunc)%s%>>(10,ltrunc)%C(auto)%d" |
523 test_decode_color |
524 nul_to_q >actual &&
525 ! grep Q actual
526'
527
466fb674
BB
528# ISO strict date format
529test_expect_success 'ISO and ISO-strict date formats display the same values' '
530 git log --format=%ai%n%ci |
531 sed -e "s/ /T/; s/ //; s/..\$/:&/" >expected &&
532 git log --format=%aI%n%cI >actual &&
533 test_cmp expected actual
534'
535
0df62117
RS
536test_expect_success 'short date' '
537 git log --format=%ad%n%cd --date=short >expected &&
538 git log --format=%as%n%cs >actual &&
539 test_cmp expected actual
540'
541
496a6980 542# get new digests (with no abbreviations)
1bd37509
JK
543test_expect_success 'set up log decoration tests' '
544 head1=$(git rev-parse --verify HEAD~0) &&
545 head2=$(git rev-parse --verify HEAD~1)
546'
496a6980 547
5e1361cc 548test_expect_success 'log decoration properly follows tag chain' '
549 git tag -a tag1 -m tag1 &&
550 git tag -a tag2 -m tag2 tag1 &&
551 git tag -d tag1 &&
552 git commit --amend -m shorter &&
553 git log --no-walk --tags --pretty="%H %d" --decorate=full >actual &&
9d1ca1da 554 cat <<-EOF >expected &&
9d1ca1da
JK
555 $head2 (tag: refs/tags/message-one)
556 $old_head1 (tag: refs/tags/message-two)
2a73022e 557 $head1 (tag: refs/tags/tag2)
9d1ca1da 558 EOF
2a73022e 559 sort -k3 actual >actual1 &&
5e1361cc 560 test_cmp expected actual1
561'
562
9271095c
HJ
563test_expect_success 'clean log decoration' '
564 git log --no-walk --tags --pretty="%H %D" --decorate=full >actual &&
9d1ca1da 565 cat >expected <<-EOF &&
9d1ca1da
JK
566 $head2 tag: refs/tags/message-one
567 $old_head1 tag: refs/tags/message-two
2a73022e 568 $head1 tag: refs/tags/tag2
9d1ca1da 569 EOF
2a73022e 570 sort -k3 actual >actual1 &&
9271095c
HJ
571 test_cmp expected actual1
572'
573
d9f31fbf
JK
574cat >trailers <<EOF
575Signed-off-by: A U Thor <author@example.com>
576Acked-by: A U Thor <author@example.com>
577[ v2 updated patch description ]
cc1735c4
JK
578Signed-off-by: A U Thor
579 <author@example.com>
d9f31fbf
JK
580EOF
581
58311c66 582unfold () {
6f5c77a1 583 perl -0pe 's/\n\s+/ /g'
58311c66
JK
584}
585
cc1735c4 586test_expect_success 'set up trailer tests' '
d9f31fbf
JK
587 echo "Some contents" >trailerfile &&
588 git add trailerfile &&
cc1735c4 589 git commit -F - <<-EOF
d9f31fbf
JK
590 trailers: this commit message has trailers
591
592 This commit is a test commit with trailers at the end. We parse this
cc1735c4 593 message and display the trailers using %(trailers).
d9f31fbf
JK
594
595 $(cat trailers)
596 EOF
cc1735c4 597'
d9f31fbf 598
cc1735c4
JK
599test_expect_success 'pretty format %(trailers) shows trailers' '
600 git log --no-walk --pretty="%(trailers)" >actual &&
601 {
602 cat trailers &&
603 echo
604 } >expect &&
d9f31fbf
JK
605 test_cmp expect actual
606'
607
58311c66
JK
608test_expect_success '%(trailers:only) shows only "key: value" trailers' '
609 git log --no-walk --pretty="%(trailers:only)" >actual &&
610 {
611 grep -v patch.description <trailers &&
612 echo
613 } >expect &&
614 test_cmp expect actual
615'
616
4f732e0f
AW
617test_expect_success '%(trailers:only=yes) shows only "key: value" trailers' '
618 git log --no-walk --pretty=format:"%(trailers:only=yes)" >actual &&
619 grep -v patch.description <trailers >expect &&
620 test_cmp expect actual
621'
622
623test_expect_success '%(trailers:only=no) shows all trailers' '
624 git log --no-walk --pretty=format:"%(trailers:only=no)" >actual &&
625 cat trailers >expect &&
626 test_cmp expect actual
627'
628
629test_expect_success '%(trailers:only=no,only=true) shows only "key: value" trailers' '
630 git log --no-walk --pretty=format:"%(trailers:only=yes)" >actual &&
631 grep -v patch.description <trailers >expect &&
632 test_cmp expect actual
58311c66
JK
633'
634
635test_expect_success '%(trailers:unfold) unfolds trailers' '
636 git log --no-walk --pretty="%(trailers:unfold)" >actual &&
637 {
638 unfold <trailers &&
639 echo
640 } >expect &&
641 test_cmp expect actual
642'
643
644test_expect_success ':only and :unfold work together' '
84ff053d
TB
645 git log --no-walk --pretty="%(trailers:only,unfold)" >actual &&
646 git log --no-walk --pretty="%(trailers:unfold,only)" >reverse &&
58311c66
JK
647 test_cmp actual reverse &&
648 {
649 grep -v patch.description <trailers | unfold &&
650 echo
651 } >expect &&
652 test_cmp expect actual
653'
654
250bea0c
AW
655test_expect_success 'pretty format %(trailers:key=foo) shows that trailer' '
656 git log --no-walk --pretty="format:%(trailers:key=Acked-by)" >actual &&
657 echo "Acked-by: A U Thor <author@example.com>" >expect &&
658 test_cmp expect actual
659'
660
661test_expect_success 'pretty format %(trailers:key=foo) is case insensitive' '
662 git log --no-walk --pretty="format:%(trailers:key=AcKed-bY)" >actual &&
663 echo "Acked-by: A U Thor <author@example.com>" >expect &&
664 test_cmp expect actual
665'
666
667test_expect_success 'pretty format %(trailers:key=foo:) trailing colon also works' '
668 git log --no-walk --pretty="format:%(trailers:key=Acked-by:)" >actual &&
669 echo "Acked-by: A U Thor <author@example.com>" >expect &&
670 test_cmp expect actual
671'
672
673test_expect_success 'pretty format %(trailers:key=foo) multiple keys' '
674 git log --no-walk --pretty="format:%(trailers:key=Acked-by:,key=Signed-off-By)" >actual &&
675 grep -v patch.description <trailers >expect &&
676 test_cmp expect actual
677'
678
4dc8b1c1 679test_expect_success '%(trailers:key=nonexistent) becomes empty' '
250bea0c
AW
680 git log --no-walk --pretty="x%(trailers:key=Nacked-by)x" >actual &&
681 echo "xx" >expect &&
682 test_cmp expect actual
683'
684
685test_expect_success '%(trailers:key=foo) handles multiple lines even if folded' '
686 git log --no-walk --pretty="format:%(trailers:key=Signed-Off-by)" >actual &&
687 grep -v patch.description <trailers | grep -v Acked-by >expect &&
688 test_cmp expect actual
689'
690
691test_expect_success '%(trailers:key=foo,unfold) properly unfolds' '
692 git log --no-walk --pretty="format:%(trailers:key=Signed-Off-by,unfold)" >actual &&
693 unfold <trailers | grep Signed-off-by >expect &&
694 test_cmp expect actual
695'
696
697test_expect_success 'pretty format %(trailers:key=foo,only=no) also includes nontrailer lines' '
698 git log --no-walk --pretty="format:%(trailers:key=Acked-by,only=no)" >actual &&
699 {
700 echo "Acked-by: A U Thor <author@example.com>" &&
701 grep patch.description <trailers
702 } >expect &&
703 test_cmp expect actual
704'
705
706test_expect_success '%(trailers:key) without value is error' '
707 git log --no-walk --pretty="tformat:%(trailers:key)" >actual &&
708 echo "%(trailers:key)" >expect &&
709 test_cmp expect actual
710'
711
d9b936db
AW
712test_expect_success '%(trailers:key=foo,valueonly) shows only value' '
713 git log --no-walk --pretty="format:%(trailers:key=Acked-by,valueonly)" >actual &&
714 echo "A U Thor <author@example.com>" >expect &&
715 test_cmp expect actual
716'
717
0b691d86
AW
718test_expect_success 'pretty format %(trailers:separator) changes separator' '
719 git log --no-walk --pretty=format:"X%(trailers:separator=%x00,unfold)X" >actual &&
720 printf "XSigned-off-by: A U Thor <author@example.com>\0Acked-by: A U Thor <author@example.com>\0[ v2 updated patch description ]\0Signed-off-by: A U Thor <author@example.com>X" >expect &&
721 test_cmp expect actual
722'
723
724test_expect_success 'pretty format %(trailers) combining separator/key/valueonly' '
725 git commit --allow-empty -F - <<-\EOF &&
726 Important fix
727
728 The fix is explained here
729
730 Closes: #1234
731 EOF
732
733 git commit --allow-empty -F - <<-\EOF &&
734 Another fix
735
736 The fix is explained here
737
738 Closes: #567
739 Closes: #890
740 EOF
741
742 git commit --allow-empty -F - <<-\EOF &&
743 Does not close any tickets
744 EOF
745
746 git log --pretty="%s% (trailers:separator=%x2c%x20,key=Closes,valueonly)" HEAD~3.. >actual &&
747 test_write_lines \
748 "Does not close any tickets" \
749 "Another fix #567, #890" \
750 "Important fix #1234" >expect &&
751 test_cmp expect actual
752'
753
e5fba5d5
JK
754test_expect_success 'trailer parsing not fooled by --- line' '
755 git commit --allow-empty -F - <<-\EOF &&
756 this is the subject
757
758 This is the body. The message has a "---" line which would confuse a
759 message+patch parser. But here we know we have only a commit message,
760 so we get it right.
761
762 trailer: wrong
763 ---
764 This is more body.
765
766 trailer: right
767 EOF
768
769 {
770 echo "trailer: right" &&
771 echo
772 } >expect &&
773 git log --no-walk --format="%(trailers)" >actual &&
774 test_cmp expect actual
775'
776
ad6f028f
IT
777test_expect_success 'set up %S tests' '
778 git checkout --orphan source-a &&
779 test_commit one &&
780 test_commit two &&
781 git checkout -b source-b HEAD^ &&
782 test_commit three
783'
784
785test_expect_success 'log --format=%S paints branch names' '
786 cat >expect <<-\EOF &&
787 source-b
788 source-a
789 source-b
790 EOF
791 git log --format=%S source-a source-b >actual &&
792 test_cmp expect actual
793'
794
795test_expect_success 'log --format=%S paints tag names' '
796 git tag -m tagged source-tag &&
797 cat >expect <<-\EOF &&
798 source-tag
799 source-a
800 source-tag
801 EOF
802 git log --format=%S source-tag source-a >actual &&
803 test_cmp expect actual
804'
805
806test_expect_success 'log --format=%S paints symmetric ranges' '
807 cat >expect <<-\EOF &&
808 source-b
809 source-a
810 EOF
811 git log --format=%S source-a...source-b >actual &&
812 test_cmp expect actual
813'
814
815test_expect_success '%S in git log --format works with other placeholders (part 1)' '
816 git log --format="source-b %h" source-b >expect &&
817 git log --format="%S %h" source-b >actual &&
818 test_cmp expect actual
819'
820
821test_expect_success '%S in git log --format works with other placeholders (part 2)' '
822 git log --format="%h source-b" source-b >expect &&
823 git log --format="%h %S" source-b >actual &&
824 test_cmp expect actual
825'
826
1f0fc1db
DL
827test_expect_success 'log --pretty=reference' '
828 git log --pretty="tformat:%h (%s, %as)" >expect &&
829 git log --pretty=reference >actual &&
830 test_cmp expect actual
831'
832
833test_expect_success 'log --pretty=reference with log.date is overridden by short date' '
834 git log --pretty="tformat:%h (%s, %as)" >expect &&
835 test_config log.date rfc &&
836 git log --pretty=reference >actual &&
837 test_cmp expect actual
838'
839
840test_expect_success 'log --pretty=reference with explicit date overrides short date' '
841 git log --date=rfc --pretty="tformat:%h (%s, %ad)" >expect &&
842 git log --date=rfc --pretty=reference >actual &&
843 test_cmp expect actual
844'
845
846test_expect_success 'log --pretty=reference is never unabbreviated' '
847 git log --pretty="tformat:%h (%s, %as)" >expect &&
848 git log --no-abbrev-commit --pretty=reference >actual &&
849 test_cmp expect actual
850'
851
852test_expect_success 'log --pretty=reference is never decorated' '
853 git log --pretty="tformat:%h (%s, %as)" >expect &&
854 git log --decorate=short --pretty=reference >actual &&
855 test_cmp expect actual
856'
857
858test_expect_success 'log --pretty=reference does not output reflog info' '
859 git log --walk-reflogs --pretty="tformat:%h (%s, %as)" >expect &&
860 git log --walk-reflogs --pretty=reference >actual &&
861 test_cmp expect actual
862'
863
864test_expect_success 'log --pretty=reference is colored appropriately' '
865 git log --color=always --pretty="tformat:%C(auto)%h (%s, %as)" >expect &&
866 git log --color=always --pretty=reference >actual &&
867 test_cmp expect actual
868'
869
8028184e 870test_done