]> git.ipfire.org Git - thirdparty/git.git/blame - t/t4205-log-pretty-formats.sh
ref-cache.c: fix prefix matching in ref iteration
[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 &&
1108cea7 126 test_cmp expected actual
fafd3829
JH
127'
128
a926c4b9 129test_expect_failure '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 &&
77e04b2e 159 cat raw | lf_to_nul || return 1
ac52d941
DL
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
3593ebd3
ÆAB
528# --date=[XXX] and corresponding %a[X] %c[X] format equivalency
529test_expect_success '--date=iso-strict %ad%cd is the same as %aI%cI' '
fbfcaec8 530 git log --format=%ad%n%cd --date=iso-strict >expected &&
466fb674
BB
531 git log --format=%aI%n%cI >actual &&
532 test_cmp expected actual
533'
534
3593ebd3 535test_expect_success '--date=short %ad%cd is the same as %as%cs' '
0df62117
RS
536 git log --format=%ad%n%cd --date=short >expected &&
537 git log --format=%as%n%cs >actual &&
538 test_cmp expected actual
539'
540
b722d456
ZH
541test_expect_success '--date=human %ad%cd is the same as %ah%ch' '
542 git log --format=%ad%n%cd --date=human >expected &&
543 git log --format=%ah%n%ch >actual &&
544 test_cmp expected actual
545'
546
496a6980 547# get new digests (with no abbreviations)
1bd37509
JK
548test_expect_success 'set up log decoration tests' '
549 head1=$(git rev-parse --verify HEAD~0) &&
550 head2=$(git rev-parse --verify HEAD~1)
551'
496a6980 552
5e1361cc 553test_expect_success 'log decoration properly follows tag chain' '
554 git tag -a tag1 -m tag1 &&
555 git tag -a tag2 -m tag2 tag1 &&
556 git tag -d tag1 &&
557 git commit --amend -m shorter &&
558 git log --no-walk --tags --pretty="%H %d" --decorate=full >actual &&
9d1ca1da 559 cat <<-EOF >expected &&
9d1ca1da
JK
560 $head2 (tag: refs/tags/message-one)
561 $old_head1 (tag: refs/tags/message-two)
2a73022e 562 $head1 (tag: refs/tags/tag2)
9d1ca1da 563 EOF
2a73022e 564 sort -k3 actual >actual1 &&
5e1361cc 565 test_cmp expected actual1
566'
567
9271095c
HJ
568test_expect_success 'clean log decoration' '
569 git log --no-walk --tags --pretty="%H %D" --decorate=full >actual &&
9d1ca1da 570 cat >expected <<-EOF &&
9d1ca1da
JK
571 $head2 tag: refs/tags/message-one
572 $old_head1 tag: refs/tags/message-two
2a73022e 573 $head1 tag: refs/tags/tag2
9d1ca1da 574 EOF
2a73022e 575 sort -k3 actual >actual1 &&
9271095c
HJ
576 test_cmp expected actual1
577'
578
d9f31fbf
JK
579cat >trailers <<EOF
580Signed-off-by: A U Thor <author@example.com>
581Acked-by: A U Thor <author@example.com>
582[ v2 updated patch description ]
cc1735c4
JK
583Signed-off-by: A U Thor
584 <author@example.com>
d9f31fbf
JK
585EOF
586
58311c66 587unfold () {
6f5c77a1 588 perl -0pe 's/\n\s+/ /g'
58311c66
JK
589}
590
cc1735c4 591test_expect_success 'set up trailer tests' '
d9f31fbf
JK
592 echo "Some contents" >trailerfile &&
593 git add trailerfile &&
cc1735c4 594 git commit -F - <<-EOF
d9f31fbf
JK
595 trailers: this commit message has trailers
596
597 This commit is a test commit with trailers at the end. We parse this
cc1735c4 598 message and display the trailers using %(trailers).
d9f31fbf
JK
599
600 $(cat trailers)
601 EOF
cc1735c4 602'
d9f31fbf 603
cc1735c4
JK
604test_expect_success 'pretty format %(trailers) shows trailers' '
605 git log --no-walk --pretty="%(trailers)" >actual &&
606 {
607 cat trailers &&
608 echo
609 } >expect &&
d9f31fbf
JK
610 test_cmp expect actual
611'
612
8b966a05
ÆAB
613test_expect_success 'pretty format %(trailers:) enables no options' '
614 git log --no-walk --pretty="%(trailers:)" >actual &&
615 # "expect" the same as the test above
616 test_cmp expect actual
617'
618
58311c66
JK
619test_expect_success '%(trailers:only) shows only "key: value" trailers' '
620 git log --no-walk --pretty="%(trailers:only)" >actual &&
621 {
622 grep -v patch.description <trailers &&
623 echo
624 } >expect &&
625 test_cmp expect actual
626'
627
4f732e0f
AW
628test_expect_success '%(trailers:only=yes) shows only "key: value" trailers' '
629 git log --no-walk --pretty=format:"%(trailers:only=yes)" >actual &&
630 grep -v patch.description <trailers >expect &&
631 test_cmp expect actual
632'
633
634test_expect_success '%(trailers:only=no) shows all trailers' '
635 git log --no-walk --pretty=format:"%(trailers:only=no)" >actual &&
636 cat trailers >expect &&
637 test_cmp expect actual
638'
639
640test_expect_success '%(trailers:only=no,only=true) shows only "key: value" trailers' '
641 git log --no-walk --pretty=format:"%(trailers:only=yes)" >actual &&
642 grep -v patch.description <trailers >expect &&
643 test_cmp expect actual
58311c66
JK
644'
645
646test_expect_success '%(trailers:unfold) unfolds trailers' '
647 git log --no-walk --pretty="%(trailers:unfold)" >actual &&
648 {
649 unfold <trailers &&
650 echo
651 } >expect &&
652 test_cmp expect actual
653'
654
655test_expect_success ':only and :unfold work together' '
84ff053d
TB
656 git log --no-walk --pretty="%(trailers:only,unfold)" >actual &&
657 git log --no-walk --pretty="%(trailers:unfold,only)" >reverse &&
58311c66
JK
658 test_cmp actual reverse &&
659 {
660 grep -v patch.description <trailers | unfold &&
661 echo
662 } >expect &&
663 test_cmp expect actual
664'
665
250bea0c
AW
666test_expect_success 'pretty format %(trailers:key=foo) shows that trailer' '
667 git log --no-walk --pretty="format:%(trailers:key=Acked-by)" >actual &&
668 echo "Acked-by: A U Thor <author@example.com>" >expect &&
669 test_cmp expect actual
670'
671
672test_expect_success 'pretty format %(trailers:key=foo) is case insensitive' '
673 git log --no-walk --pretty="format:%(trailers:key=AcKed-bY)" >actual &&
674 echo "Acked-by: A U Thor <author@example.com>" >expect &&
675 test_cmp expect actual
676'
677
678test_expect_success 'pretty format %(trailers:key=foo:) trailing colon also works' '
679 git log --no-walk --pretty="format:%(trailers:key=Acked-by:)" >actual &&
680 echo "Acked-by: A U Thor <author@example.com>" >expect &&
681 test_cmp expect actual
682'
683
684test_expect_success 'pretty format %(trailers:key=foo) multiple keys' '
685 git log --no-walk --pretty="format:%(trailers:key=Acked-by:,key=Signed-off-By)" >actual &&
686 grep -v patch.description <trailers >expect &&
687 test_cmp expect actual
688'
689
4dc8b1c1 690test_expect_success '%(trailers:key=nonexistent) becomes empty' '
250bea0c
AW
691 git log --no-walk --pretty="x%(trailers:key=Nacked-by)x" >actual &&
692 echo "xx" >expect &&
693 test_cmp expect actual
694'
695
696test_expect_success '%(trailers:key=foo) handles multiple lines even if folded' '
697 git log --no-walk --pretty="format:%(trailers:key=Signed-Off-by)" >actual &&
698 grep -v patch.description <trailers | grep -v Acked-by >expect &&
699 test_cmp expect actual
700'
701
702test_expect_success '%(trailers:key=foo,unfold) properly unfolds' '
703 git log --no-walk --pretty="format:%(trailers:key=Signed-Off-by,unfold)" >actual &&
704 unfold <trailers | grep Signed-off-by >expect &&
705 test_cmp expect actual
706'
707
708test_expect_success 'pretty format %(trailers:key=foo,only=no) also includes nontrailer lines' '
709 git log --no-walk --pretty="format:%(trailers:key=Acked-by,only=no)" >actual &&
710 {
711 echo "Acked-by: A U Thor <author@example.com>" &&
712 grep patch.description <trailers
713 } >expect &&
714 test_cmp expect actual
715'
716
717test_expect_success '%(trailers:key) without value is error' '
718 git log --no-walk --pretty="tformat:%(trailers:key)" >actual &&
719 echo "%(trailers:key)" >expect &&
720 test_cmp expect actual
721'
722
9d87d5ae
ÆAB
723test_expect_success '%(trailers:keyonly) shows only keys' '
724 git log --no-walk --pretty="format:%(trailers:keyonly)" >actual &&
725 test_write_lines \
726 "Signed-off-by" \
727 "Acked-by" \
728 "[ v2 updated patch description ]" \
729 "Signed-off-by" >expect &&
730 test_cmp expect actual
731'
732
733test_expect_success '%(trailers:key=foo,keyonly) shows only key' '
734 git log --no-walk --pretty="format:%(trailers:key=Acked-by,keyonly)" >actual &&
735 echo "Acked-by" >expect &&
736 test_cmp expect actual
737'
738
d9b936db
AW
739test_expect_success '%(trailers:key=foo,valueonly) shows only value' '
740 git log --no-walk --pretty="format:%(trailers:key=Acked-by,valueonly)" >actual &&
741 echo "A U Thor <author@example.com>" >expect &&
742 test_cmp expect actual
743'
744
8b966a05
ÆAB
745test_expect_success '%(trailers:valueonly) shows only values' '
746 git log --no-walk --pretty="format:%(trailers:valueonly)" >actual &&
747 test_write_lines \
748 "A U Thor <author@example.com>" \
749 "A U Thor <author@example.com>" \
750 "[ v2 updated patch description ]" \
751 "A U Thor" \
752 " <author@example.com>" >expect &&
753 test_cmp expect actual
754'
755
9d87d5ae
ÆAB
756test_expect_success '%(trailers:key=foo,keyonly,valueonly) shows nothing' '
757 git log --no-walk --pretty="format:%(trailers:key=Acked-by,keyonly,valueonly)" >actual &&
758 echo >expect &&
759 test_cmp expect actual
760'
761
0b691d86 762test_expect_success 'pretty format %(trailers:separator) changes separator' '
8b966a05
ÆAB
763 git log --no-walk --pretty=format:"X%(trailers:separator=%x00)X" >actual &&
764 (
765 printf "XSigned-off-by: A U Thor <author@example.com>\0" &&
766 printf "Acked-by: A U Thor <author@example.com>\0" &&
767 printf "[ v2 updated patch description ]\0" &&
768 printf "Signed-off-by: A U Thor\n <author@example.com>X"
769 ) >expect &&
770 test_cmp expect actual
771'
772
773test_expect_success 'pretty format %(trailers:separator=X,unfold) changes separator' '
0b691d86 774 git log --no-walk --pretty=format:"X%(trailers:separator=%x00,unfold)X" >actual &&
7c1f79fc
ÆAB
775 (
776 printf "XSigned-off-by: A U Thor <author@example.com>\0" &&
777 printf "Acked-by: A U Thor <author@example.com>\0" &&
778 printf "[ v2 updated patch description ]\0" &&
779 printf "Signed-off-by: A U Thor <author@example.com>X"
780 ) >expect &&
0b691d86 781 test_cmp expect actual
058761f1
ÆAB
782'
783
784test_expect_success 'pretty format %(trailers:key_value_separator) changes key-value separator' '
785 git log --no-walk --pretty=format:"X%(trailers:key_value_separator=%x00)X" >actual &&
786 (
787 printf "XSigned-off-by\0A U Thor <author@example.com>\n" &&
788 printf "Acked-by\0A U Thor <author@example.com>\n" &&
789 printf "[ v2 updated patch description ]\n" &&
790 printf "Signed-off-by\0A U Thor\n <author@example.com>\nX"
791 ) >expect &&
792 test_cmp expect actual
793'
794
795test_expect_success 'pretty format %(trailers:key_value_separator,unfold) changes key-value separator' '
796 git log --no-walk --pretty=format:"X%(trailers:key_value_separator=%x00,unfold)X" >actual &&
797 (
798 printf "XSigned-off-by\0A U Thor <author@example.com>\n" &&
799 printf "Acked-by\0A U Thor <author@example.com>\n" &&
800 printf "[ v2 updated patch description ]\n" &&
801 printf "Signed-off-by\0A U Thor <author@example.com>\nX"
802 ) >expect &&
803 test_cmp expect actual
804'
805
806test_expect_success 'pretty format %(trailers:separator,key_value_separator) changes both separators' '
807 git log --no-walk --pretty=format:"%(trailers:separator=%x00,key_value_separator=%x00%x00,unfold)" >actual &&
808 (
809 printf "Signed-off-by\0\0A U Thor <author@example.com>\0" &&
810 printf "Acked-by\0\0A U Thor <author@example.com>\0" &&
811 printf "[ v2 updated patch description ]\0" &&
812 printf "Signed-off-by\0\0A U Thor <author@example.com>"
813 ) >expect &&
814 test_cmp expect actual
0b691d86
AW
815'
816
9d87d5ae 817test_expect_success 'pretty format %(trailers) combining separator/key/keyonly/valueonly' '
0b691d86
AW
818 git commit --allow-empty -F - <<-\EOF &&
819 Important fix
820
821 The fix is explained here
822
823 Closes: #1234
824 EOF
825
826 git commit --allow-empty -F - <<-\EOF &&
827 Another fix
828
829 The fix is explained here
830
831 Closes: #567
832 Closes: #890
833 EOF
834
835 git commit --allow-empty -F - <<-\EOF &&
836 Does not close any tickets
837 EOF
838
839 git log --pretty="%s% (trailers:separator=%x2c%x20,key=Closes,valueonly)" HEAD~3.. >actual &&
840 test_write_lines \
841 "Does not close any tickets" \
842 "Another fix #567, #890" \
843 "Important fix #1234" >expect &&
9d87d5ae
ÆAB
844 test_cmp expect actual &&
845
846 git log --pretty="%s% (trailers:separator=%x2c%x20,key=Closes,keyonly)" HEAD~3.. >actual &&
847 test_write_lines \
848 "Does not close any tickets" \
849 "Another fix Closes, Closes" \
850 "Important fix Closes" >expect &&
0b691d86
AW
851 test_cmp expect actual
852'
853
e5fba5d5
JK
854test_expect_success 'trailer parsing not fooled by --- line' '
855 git commit --allow-empty -F - <<-\EOF &&
856 this is the subject
857
858 This is the body. The message has a "---" line which would confuse a
859 message+patch parser. But here we know we have only a commit message,
860 so we get it right.
861
862 trailer: wrong
863 ---
864 This is more body.
865
866 trailer: right
867 EOF
868
869 {
870 echo "trailer: right" &&
871 echo
872 } >expect &&
873 git log --no-walk --format="%(trailers)" >actual &&
874 test_cmp expect actual
875'
876
ad6f028f
IT
877test_expect_success 'set up %S tests' '
878 git checkout --orphan source-a &&
879 test_commit one &&
880 test_commit two &&
881 git checkout -b source-b HEAD^ &&
882 test_commit three
883'
884
885test_expect_success 'log --format=%S paints branch names' '
886 cat >expect <<-\EOF &&
887 source-b
888 source-a
889 source-b
890 EOF
891 git log --format=%S source-a source-b >actual &&
892 test_cmp expect actual
893'
894
895test_expect_success 'log --format=%S paints tag names' '
896 git tag -m tagged source-tag &&
897 cat >expect <<-\EOF &&
898 source-tag
899 source-a
900 source-tag
901 EOF
902 git log --format=%S source-tag source-a >actual &&
903 test_cmp expect actual
904'
905
906test_expect_success 'log --format=%S paints symmetric ranges' '
907 cat >expect <<-\EOF &&
908 source-b
909 source-a
910 EOF
911 git log --format=%S source-a...source-b >actual &&
912 test_cmp expect actual
913'
914
915test_expect_success '%S in git log --format works with other placeholders (part 1)' '
916 git log --format="source-b %h" source-b >expect &&
917 git log --format="%S %h" source-b >actual &&
918 test_cmp expect actual
919'
920
921test_expect_success '%S in git log --format works with other placeholders (part 2)' '
922 git log --format="%h source-b" source-b >expect &&
923 git log --format="%h %S" source-b >actual &&
924 test_cmp expect actual
925'
926
5305474e
VD
927test_expect_success 'setup more commits for %S with --bisect' '
928 test_commit four &&
929 test_commit five &&
930
931 head1=$(git rev-parse --verify HEAD~0) &&
932 head2=$(git rev-parse --verify HEAD~1) &&
933 head3=$(git rev-parse --verify HEAD~2) &&
934 head4=$(git rev-parse --verify HEAD~3)
935'
936
937test_expect_success '%S with --bisect labels commits with refs/bisect/bad ref' '
938 git update-ref refs/bisect/bad-$head1 $head1 &&
939 git update-ref refs/bisect/go $head1 &&
940 git update-ref refs/bisect/bad-$head2 $head2 &&
941 git update-ref refs/bisect/b $head3 &&
942 git update-ref refs/bisect/bad-$head4 $head4 &&
943 git update-ref refs/bisect/good-$head4 $head4 &&
944
945 # We expect to see the range of commits betwee refs/bisect/good-$head4
946 # and refs/bisect/bad-$head1. The "source" ref is the nearest bisect ref
947 # from which the commit is reachable.
948 cat >expect <<-EOF &&
949 $head1 refs/bisect/bad-$head1
950 $head2 refs/bisect/bad-$head2
951 $head3 refs/bisect/bad-$head2
952 EOF
953 git log --bisect --format="%H %S" >actual &&
954 test_cmp expect actual
955'
956
1f0fc1db
DL
957test_expect_success 'log --pretty=reference' '
958 git log --pretty="tformat:%h (%s, %as)" >expect &&
959 git log --pretty=reference >actual &&
960 test_cmp expect actual
961'
962
963test_expect_success 'log --pretty=reference with log.date is overridden by short date' '
964 git log --pretty="tformat:%h (%s, %as)" >expect &&
965 test_config log.date rfc &&
966 git log --pretty=reference >actual &&
967 test_cmp expect actual
968'
969
970test_expect_success 'log --pretty=reference with explicit date overrides short date' '
971 git log --date=rfc --pretty="tformat:%h (%s, %ad)" >expect &&
972 git log --date=rfc --pretty=reference >actual &&
973 test_cmp expect actual
974'
975
976test_expect_success 'log --pretty=reference is never unabbreviated' '
977 git log --pretty="tformat:%h (%s, %as)" >expect &&
978 git log --no-abbrev-commit --pretty=reference >actual &&
979 test_cmp expect actual
980'
981
982test_expect_success 'log --pretty=reference is never decorated' '
983 git log --pretty="tformat:%h (%s, %as)" >expect &&
984 git log --decorate=short --pretty=reference >actual &&
985 test_cmp expect actual
986'
987
988test_expect_success 'log --pretty=reference does not output reflog info' '
989 git log --walk-reflogs --pretty="tformat:%h (%s, %as)" >expect &&
990 git log --walk-reflogs --pretty=reference >actual &&
991 test_cmp expect actual
992'
993
994test_expect_success 'log --pretty=reference is colored appropriately' '
995 git log --color=always --pretty="tformat:%C(auto)%h (%s, %as)" >expect &&
996 git log --color=always --pretty=reference >actual &&
997 test_cmp expect actual
998'
999
15ae82d5
RS
1000test_expect_success '%(describe) vs git describe' '
1001 git log --format="%H" | while read hash
1002 do
09fe8ca9
RS
1003 if desc=$(git describe $hash)
1004 then
1005 : >expect-contains-good
1006 else
1007 : >expect-contains-bad
1008 fi &&
cbe1d9d6 1009 echo "$hash $desc" || return 1
15ae82d5 1010 done >expect &&
09fe8ca9
RS
1011 test_path_exists expect-contains-good &&
1012 test_path_exists expect-contains-bad &&
1013
15ae82d5
RS
1014 git log --format="%H %(describe)" >actual 2>err &&
1015 test_cmp expect actual &&
1016 test_must_be_empty err
1017'
1018
b081547e
RS
1019test_expect_success '%(describe:match=...) vs git describe --match ...' '
1020 test_when_finished "git tag -d tag-match" &&
52ff891c 1021 git tag -a -m tagged tag-match &&
b081547e
RS
1022 git describe --match "*-match" >expect &&
1023 git log -1 --format="%(describe:match=*-match)" >actual &&
1024 test_cmp expect actual
1025'
1026
1027test_expect_success '%(describe:exclude=...) vs git describe --exclude ...' '
1028 test_when_finished "git tag -d tag-exclude" &&
1029 git tag -a -m tagged tag-exclude &&
1030 git describe --exclude "*-exclude" >expect &&
1031 git log -1 --format="%(describe:exclude=*-exclude)" >actual &&
1032 test_cmp expect actual
1033'
1034
1d517cea
ES
1035test_expect_success '%(describe:tags) vs git describe --tags' '
1036 test_when_finished "git tag -d tagname" &&
1037 git tag tagname &&
1038 git describe --tags >expect &&
1039 git log -1 --format="%(describe:tags)" >actual &&
1040 test_cmp expect actual
1041'
1042
eccd97d0
ES
1043test_expect_success '%(describe:abbrev=...) vs git describe --abbrev=...' '
1044 test_when_finished "git tag -d tagname" &&
1876a5ae
KS
1045
1046 # Case 1: We have commits between HEAD and the most recent tag
1047 # reachable from it
1048 test_commit --no-tag file &&
1049 git describe --abbrev=15 >expect &&
1050 git log -1 --format="%(describe:abbrev=15)" >actual &&
1051 test_cmp expect actual &&
1052
1053 # Make sure the hash used is at least 15 digits long
1054 sed -e "s/^.*-g\([0-9a-f]*\)$/\1/" <actual >hexpart &&
1055 test 16 -le $(wc -c <hexpart) &&
1056
1057 # Case 2: We have a tag at HEAD, describe directly gives the
1058 # name of the tag
eccd97d0
ES
1059 git tag -a -m tagged tagname &&
1060 git describe --abbrev=15 >expect &&
1061 git log -1 --format="%(describe:abbrev=15)" >actual &&
1876a5ae
KS
1062 test_cmp expect actual &&
1063 test tagname = $(cat actual)
eccd97d0
ES
1064'
1065
b49f309a
PS
1066test_expect_success 'log --pretty with space stealing' '
1067 printf mm0 >expect &&
1068 git log -1 --pretty="format:mm%>>|(1)%x30" >actual &&
1069 test_cmp expect actual
1070'
1071
f6e0b9f3
PS
1072test_expect_success 'log --pretty with invalid padding format' '
1073 printf "%s%%<(20" "$(git rev-parse HEAD)" >expect &&
1074 git log -1 --pretty="format:%H%<(20" >actual &&
1075 test_cmp expect actual
1076'
1077
1de69c0c
PS
1078test_expect_success 'log --pretty with magical wrapping directives' '
1079 commit_id=$(git commit-tree HEAD^{tree} -m "describe me") &&
1080 git tag describe-me $commit_id &&
1081 printf "\n(tag:\ndescribe-me)%%+w(2)" >expect &&
1082 git log -1 --pretty="format:%w(1)%+d%+w(2)" $commit_id >actual &&
1083 test_cmp expect actual
1084'
1085
48050c42 1086test_expect_success SIZE_T_IS_64BIT 'log --pretty with overflowing wrapping directive' '
304a50ad
PS
1087 printf "%%w(2147483649,1,1)0" >expect &&
1088 git log -1 --pretty="format:%w(2147483649,1,1)%x30" >actual &&
1089 test_cmp expect actual &&
1090 printf "%%w(1,2147483649,1)0" >expect &&
1091 git log -1 --pretty="format:%w(1,2147483649,1)%x30" >actual &&
1092 test_cmp expect actual &&
1093 printf "%%w(1,1,2147483649)0" >expect &&
1094 git log -1 --pretty="format:%w(1,1,2147483649)%x30" >actual &&
1095 test_cmp expect actual
1096'
1097
1098test_expect_success SIZE_T_IS_64BIT 'log --pretty with overflowing padding directive' '
1099 printf "%%<(2147483649)0" >expect &&
1100 git log -1 --pretty="format:%<(2147483649)%x30" >actual &&
1101 test_cmp expect actual
48050c42
PS
1102'
1103
17d23e8a
PS
1104test_expect_success 'log --pretty with padding and preceding control chars' '
1105 printf "\20\20 0" >expect &&
1106 git log -1 --pretty="format:%x10%x10%>|(4)%x30" >actual &&
1107 test_cmp expect actual
81c2d4c3
PS
1108'
1109
1110test_expect_success 'log --pretty truncation with control chars' '
1111 test_commit "$(printf "\20\20\20\20xxxx")" file contents commit-with-control-chars &&
1112 printf "\20\20\20\20x.." >expect &&
1113 git log -1 --pretty="format:%<(3,trunc)%s" commit-with-control-chars >actual &&
1114 test_cmp expect actual
17d23e8a
PS
1115'
1116
81dc898d
PS
1117test_expect_success EXPENSIVE,SIZE_T_IS_64BIT 'log --pretty with huge commit message' '
1118 # We only assert that this command does not crash. This needs to be
1119 # executed with the address sanitizer to demonstrate failure.
1120 git log -1 --pretty="format:%>(2147483646)%x41%41%>(2147483646)%x41" >/dev/null
1121'
1122
1123test_expect_success EXPENSIVE,SIZE_T_IS_64BIT 'set up huge commit' '
1124 test-tool genzeros 2147483649 | tr "\000" "1" >expect &&
1125 huge_commit=$(git commit-tree -F expect HEAD^{tree})
1126'
1127
1128test_expect_success EXPENSIVE,SIZE_T_IS_64BIT 'log --pretty with huge commit message' '
1129 git log -1 --format="%B%<(1)%x30" $huge_commit >actual &&
1130 echo 0 >>expect &&
1131 test_cmp expect actual
1132'
1133
937b71cc
PS
1134test_expect_success EXPENSIVE,SIZE_T_IS_64BIT 'log --pretty with huge commit message does not cause allocation failure' '
1135 test_must_fail git log -1 --format="%<(1)%B" $huge_commit 2>error &&
1136 cat >expect <<-EOF &&
1137 fatal: number too large to represent as int on this platform: 2147483649
1138 EOF
1139 test_cmp expect error
1140'
1141
540e7bc4
PO
1142# pretty-formats note wide char limitations, and add tests
1143test_expect_failure 'wide and decomposed characters column counting' '
1144
1145# from t/lib-unicode-nfc-nfd.sh hex values converted to octal
1146 utf8_nfc=$(printf "\303\251") && # e acute combined.
1147 utf8_nfd=$(printf "\145\314\201") && # e with a combining acute (i.e. decomposed)
1148 utf8_emoji=$(printf "\360\237\221\250") &&
1149
1150# replacement character when requesting a wide char fits in a single display colum.
1151# "half wide" alternative could be a plain ASCII dot `.`
1152 utf8_vert_ell=$(printf "\342\213\256") &&
1153
1154# use ${xxx} here!
1155 nfc10="${utf8_nfc}${utf8_nfc}${utf8_nfc}${utf8_nfc}${utf8_nfc}${utf8_nfc}${utf8_nfc}${utf8_nfc}${utf8_nfc}${utf8_nfc}" &&
1156 nfd10="${utf8_nfd}${utf8_nfd}${utf8_nfd}${utf8_nfd}${utf8_nfd}${utf8_nfd}${utf8_nfd}${utf8_nfd}${utf8_nfd}${utf8_nfd}" &&
1157 emoji5="${utf8_emoji}${utf8_emoji}${utf8_emoji}${utf8_emoji}${utf8_emoji}" &&
1158# emoji5 uses 10 display columns
1159
1160 test_commit "abcdefghij" &&
1161 test_commit --no-tag "${nfc10}" &&
1162 test_commit --no-tag "${nfd10}" &&
1163 test_commit --no-tag "${emoji5}" &&
1164 printf "${utf8_emoji}..${utf8_emoji}${utf8_vert_ell}\n${utf8_nfd}..${utf8_nfd}${utf8_nfd}\n${utf8_nfc}..${utf8_nfc}${utf8_nfc}\na..ij\n" >expected &&
1165 git log --format="%<(5,mtrunc)%s" -4 >actual &&
1166 test_cmp expected actual
1167'
1168
8028184e 1169test_done