]> git.ipfire.org Git - thirdparty/git.git/blame_incremental - t/t6006-rev-list-format.sh
upload-pack: move allow_unadvertised_object_request to upload_pack_data
[thirdparty/git.git] / t / t6006-rev-list-format.sh
... / ...
CommitLineData
1#!/bin/sh
2
3# Copyright (c) 2009 Jens Lehmann
4# Copyright (c) 2011 Alexey Shumkin (+ non-UTF-8 commit encoding tests)
5
6test_description='git rev-list --pretty=format test'
7
8. ./test-lib.sh
9. "$TEST_DIRECTORY"/lib-terminal.sh
10
11test_tick
12# Tested non-UTF-8 encoding
13test_encoding="ISO8859-1"
14
15# String "added" in German
16# (translated with Google Translate),
17# encoded in UTF-8, used as a commit log message below.
18added_utf8_part=$(printf "\303\274")
19added_utf8_part_iso88591=$(echo "$added_utf8_part" | iconv -f utf-8 -t $test_encoding)
20added=$(printf "added (hinzugef${added_utf8_part}gt) foo")
21added_iso88591=$(echo "$added" | iconv -f utf-8 -t $test_encoding)
22# same but "changed"
23changed_utf8_part=$(printf "\303\244")
24changed_utf8_part_iso88591=$(echo "$changed_utf8_part" | iconv -f utf-8 -t $test_encoding)
25changed=$(printf "changed (ge${changed_utf8_part}ndert) foo")
26changed_iso88591=$(echo "$changed" | iconv -f utf-8 -t $test_encoding)
27
28# Count of char to truncate
29# Number is chosen so, that non-ACSII characters
30# (see $added_utf8_part and $changed_utf8_part)
31# fall into truncated parts of appropriate words both from left and right
32truncate_count=20
33
34test_expect_success 'setup' '
35 test_oid_init &&
36 : >foo &&
37 git add foo &&
38 git config i18n.commitEncoding $test_encoding &&
39 echo "$added_iso88591" | git commit -F - &&
40 head1=$(git rev-parse --verify HEAD) &&
41 head1_short=$(git rev-parse --verify --short $head1) &&
42 tree1=$(git rev-parse --verify HEAD:) &&
43 tree1_short=$(git rev-parse --verify --short $tree1) &&
44 echo "$changed" > foo &&
45 echo "$changed_iso88591" | git commit -a -F - &&
46 head2=$(git rev-parse --verify HEAD) &&
47 head2_short=$(git rev-parse --verify --short $head2) &&
48 tree2=$(git rev-parse --verify HEAD:) &&
49 tree2_short=$(git rev-parse --verify --short $tree2) &&
50 git config --unset i18n.commitEncoding
51'
52
53# usage: test_format name format_string [failure] <expected_output
54test_format () {
55 cat >expect.$1
56 test_expect_${3:-success} "format $1" "
57 git rev-list --pretty=format:'$2' master >output.$1 &&
58 test_cmp expect.$1 output.$1
59 "
60}
61
62# Feed to --format to provide predictable colored sequences.
63BASIC_COLOR='%Credfoo%Creset'
64COLOR='%C(red)foo%C(reset)'
65AUTO_COLOR='%C(auto,red)foo%C(auto,reset)'
66ALWAYS_COLOR='%C(always,red)foo%C(always,reset)'
67has_color () {
68 test_decode_color <"$1" >decoded &&
69 echo "<RED>foo<RESET>" >expect &&
70 test_cmp expect decoded
71}
72
73has_no_color () {
74 echo foo >expect &&
75 test_cmp expect "$1"
76}
77
78test_format percent %%h <<EOF
79commit $head2
80%h
81commit $head1
82%h
83EOF
84
85test_format hash %H%n%h <<EOF
86commit $head2
87$head2
88$head2_short
89commit $head1
90$head1
91$head1_short
92EOF
93
94test_format tree %T%n%t <<EOF
95commit $head2
96$tree2
97$tree2_short
98commit $head1
99$tree1
100$tree1_short
101EOF
102
103test_format parents %P%n%p <<EOF
104commit $head2
105$head1
106$head1_short
107commit $head1
108
109
110EOF
111
112# we don't test relative here
113test_format author %an%n%ae%n%al%n%ad%n%aD%n%at <<EOF
114commit $head2
115$GIT_AUTHOR_NAME
116$GIT_AUTHOR_EMAIL
117$TEST_AUTHOR_LOCALNAME
118Thu Apr 7 15:13:13 2005 -0700
119Thu, 7 Apr 2005 15:13:13 -0700
1201112911993
121commit $head1
122$GIT_AUTHOR_NAME
123$GIT_AUTHOR_EMAIL
124$TEST_AUTHOR_LOCALNAME
125Thu Apr 7 15:13:13 2005 -0700
126Thu, 7 Apr 2005 15:13:13 -0700
1271112911993
128EOF
129
130test_format committer %cn%n%ce%n%cl%n%cd%n%cD%n%ct <<EOF
131commit $head2
132$GIT_COMMITTER_NAME
133$GIT_COMMITTER_EMAIL
134$TEST_COMMITTER_LOCALNAME
135Thu Apr 7 15:13:13 2005 -0700
136Thu, 7 Apr 2005 15:13:13 -0700
1371112911993
138commit $head1
139$GIT_COMMITTER_NAME
140$GIT_COMMITTER_EMAIL
141$TEST_COMMITTER_LOCALNAME
142Thu Apr 7 15:13:13 2005 -0700
143Thu, 7 Apr 2005 15:13:13 -0700
1441112911993
145EOF
146
147test_format encoding %e <<EOF
148commit $head2
149$test_encoding
150commit $head1
151$test_encoding
152EOF
153
154test_format subject %s <<EOF
155commit $head2
156$changed
157commit $head1
158$added
159EOF
160
161test_format subject-truncated "%<($truncate_count,trunc)%s" <<EOF
162commit $head2
163changed (ge${changed_utf8_part}ndert)..
164commit $head1
165added (hinzugef${added_utf8_part}gt..
166EOF
167
168test_format body %b <<EOF
169commit $head2
170commit $head1
171EOF
172
173test_format raw-body %B <<EOF
174commit $head2
175$changed
176
177commit $head1
178$added
179
180EOF
181
182test_expect_success 'basic colors' '
183 cat >expect <<-EOF &&
184 commit $head2
185 <RED>foo<GREEN>bar<BLUE>baz<RESET>xyzzy
186 EOF
187 format="%Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy" &&
188 git rev-list --color --format="$format" -1 master >actual.raw &&
189 test_decode_color <actual.raw >actual &&
190 test_cmp expect actual
191'
192
193test_expect_success '%S is not a placeholder for rev-list yet' '
194 git rev-list --format="%S" -1 master | grep "%S"
195'
196
197test_expect_success 'advanced colors' '
198 cat >expect <<-EOF &&
199 commit $head2
200 <BOLD;RED;BYELLOW>foo<RESET>
201 EOF
202 format="%C(red yellow bold)foo%C(reset)" &&
203 git rev-list --color --format="$format" -1 master >actual.raw &&
204 test_decode_color <actual.raw >actual &&
205 test_cmp expect actual
206'
207
208for spec in \
209 "%Cred:$BASIC_COLOR" \
210 "%C(...):$COLOR" \
211 "%C(auto,...):$AUTO_COLOR"
212do
213 desc=${spec%%:*}
214 color=${spec#*:}
215 test_expect_success "$desc does not enable color by default" '
216 git log --format=$color -1 >actual &&
217 has_no_color actual
218 '
219
220 test_expect_success "$desc enables colors for color.diff" '
221 git -c color.diff=always log --format=$color -1 >actual &&
222 has_color actual
223 '
224
225 test_expect_success "$desc enables colors for color.ui" '
226 git -c color.ui=always log --format=$color -1 >actual &&
227 has_color actual
228 '
229
230 test_expect_success "$desc respects --color" '
231 git log --format=$color -1 --color >actual &&
232 has_color actual
233 '
234
235 test_expect_success "$desc respects --no-color" '
236 git -c color.ui=always log --format=$color -1 --no-color >actual &&
237 has_no_color actual
238 '
239
240 test_expect_success TTY "$desc respects --color=auto (stdout is tty)" '
241 test_terminal git log --format=$color -1 --color=auto >actual &&
242 has_color actual
243 '
244
245 test_expect_success "$desc respects --color=auto (stdout not tty)" '
246 (
247 TERM=vt100 && export TERM &&
248 git log --format=$color -1 --color=auto >actual &&
249 has_no_color actual
250 )
251 '
252done
253
254test_expect_success '%C(always,...) enables color even without tty' '
255 git log --format=$ALWAYS_COLOR -1 >actual &&
256 has_color actual
257'
258
259test_expect_success '%C(auto) respects --color' '
260 git log --color --format="%C(auto)%H" -1 >actual.raw &&
261 test_decode_color <actual.raw >actual &&
262 echo "<YELLOW>$(git rev-parse HEAD)<RESET>" >expect &&
263 test_cmp expect actual
264'
265
266test_expect_success '%C(auto) respects --no-color' '
267 git log --no-color --format="%C(auto)%H" -1 >actual &&
268 git rev-parse HEAD >expect &&
269 test_cmp expect actual
270'
271
272test_expect_success 'rev-list %C(auto,...) respects --color' '
273 git rev-list --color --format="%C(auto,green)foo%C(auto,reset)" \
274 -1 HEAD >actual.raw &&
275 test_decode_color <actual.raw >actual &&
276 cat >expect <<-EOF &&
277 commit $(git rev-parse HEAD)
278 <GREEN>foo<RESET>
279 EOF
280 test_cmp expect actual
281'
282
283iconv -f utf-8 -t $test_encoding > commit-msg <<EOF
284Test printing of complex bodies
285
286This commit message is much longer than the others,
287and it will be encoded in $test_encoding. We should therefore
288include an ISO8859 character: ¡bueno!
289EOF
290
291test_expect_success 'setup complex body' '
292 git config i18n.commitencoding $test_encoding &&
293 echo change2 >foo && git commit -a -F commit-msg &&
294 head3=$(git rev-parse --verify HEAD) &&
295 head3_short=$(git rev-parse --short $head3)
296'
297
298test_format complex-encoding %e <<EOF
299commit $head3
300$test_encoding
301commit $head2
302$test_encoding
303commit $head1
304$test_encoding
305EOF
306
307test_format complex-subject %s <<EOF
308commit $head3
309Test printing of complex bodies
310commit $head2
311$changed_iso88591
312commit $head1
313$added_iso88591
314EOF
315
316test_format complex-subject-trunc "%<($truncate_count,trunc)%s" <<EOF
317commit $head3
318Test printing of c..
319commit $head2
320changed (ge${changed_utf8_part_iso88591}ndert)..
321commit $head1
322added (hinzugef${added_utf8_part_iso88591}gt..
323EOF
324
325test_format complex-subject-mtrunc "%<($truncate_count,mtrunc)%s" <<EOF
326commit $head3
327Test prin..ex bodies
328commit $head2
329changed (..dert) foo
330commit $head1
331added (hi..f${added_utf8_part_iso88591}gt) foo
332EOF
333
334test_format complex-subject-ltrunc "%<($truncate_count,ltrunc)%s" <<EOF
335commit $head3
336.. of complex bodies
337commit $head2
338..ged (ge${changed_utf8_part_iso88591}ndert) foo
339commit $head1
340.. (hinzugef${added_utf8_part_iso88591}gt) foo
341EOF
342
343test_expect_success 'prepare expected messages (for test %b)' '
344 cat <<-EOF >expected.utf-8 &&
345 commit $head3
346 This commit message is much longer than the others,
347 and it will be encoded in $test_encoding. We should therefore
348 include an ISO8859 character: ¡bueno!
349
350 commit $head2
351 commit $head1
352 EOF
353 iconv -f utf-8 -t $test_encoding expected.utf-8 >expected.ISO8859-1
354'
355
356test_format complex-body %b <expected.ISO8859-1
357
358# Git uses i18n.commitEncoding if no i18n.logOutputEncoding set
359# so unset i18n.commitEncoding to test encoding conversion
360git config --unset i18n.commitEncoding
361
362test_format complex-subject-commitencoding-unset %s <<EOF
363commit $head3
364Test printing of complex bodies
365commit $head2
366$changed
367commit $head1
368$added
369EOF
370
371test_format complex-subject-commitencoding-unset-trunc "%<($truncate_count,trunc)%s" <<EOF
372commit $head3
373Test printing of c..
374commit $head2
375changed (ge${changed_utf8_part}ndert)..
376commit $head1
377added (hinzugef${added_utf8_part}gt..
378EOF
379
380test_format complex-subject-commitencoding-unset-mtrunc "%<($truncate_count,mtrunc)%s" <<EOF
381commit $head3
382Test prin..ex bodies
383commit $head2
384changed (..dert) foo
385commit $head1
386added (hi..f${added_utf8_part}gt) foo
387EOF
388
389test_format complex-subject-commitencoding-unset-ltrunc "%<($truncate_count,ltrunc)%s" <<EOF
390commit $head3
391.. of complex bodies
392commit $head2
393..ged (ge${changed_utf8_part}ndert) foo
394commit $head1
395.. (hinzugef${added_utf8_part}gt) foo
396EOF
397
398test_format complex-body-commitencoding-unset %b <expected.utf-8
399
400test_expect_success '%x00 shows NUL' '
401 echo >expect commit $head3 &&
402 echo >>expect fooQbar &&
403 git rev-list -1 --format=foo%x00bar HEAD >actual.nul &&
404 nul_to_q <actual.nul >actual &&
405 test_cmp expect actual
406'
407
408test_expect_success '%ad respects --date=' '
409 echo 2005-04-07 >expect.ad-short &&
410 git log -1 --date=short --pretty=tformat:%ad >output.ad-short master &&
411 test_cmp expect.ad-short output.ad-short
412'
413
414test_expect_success 'empty email' '
415 test_tick &&
416 C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) &&
417 A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) &&
418 verbose test "$A" = "$GIT_AUTHOR_NAME,,Thu Apr 7 15:14:13 2005 -0700"
419'
420
421test_expect_success 'del LF before empty (1)' '
422 git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD^^ >actual &&
423 test_line_count = 2 actual
424'
425
426test_expect_success 'del LF before empty (2)' '
427 git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD >actual &&
428 test_line_count = 6 actual &&
429 grep "^$" actual
430'
431
432test_expect_success 'add LF before non-empty (1)' '
433 git show -s --pretty=format:"%s%+b%nThanks%n" HEAD^^ >actual &&
434 test_line_count = 2 actual
435'
436
437test_expect_success 'add LF before non-empty (2)' '
438 git show -s --pretty=format:"%s%+b%nThanks%n" HEAD >actual &&
439 test_line_count = 6 actual &&
440 grep "^$" actual
441'
442
443test_expect_success 'add SP before non-empty (1)' '
444 git show -s --pretty=format:"%s% bThanks" HEAD^^ >actual &&
445 test $(wc -w <actual) = 3
446'
447
448test_expect_success 'add SP before non-empty (2)' '
449 git show -s --pretty=format:"%s% sThanks" HEAD^^ >actual &&
450 test $(wc -w <actual) = 6
451'
452
453test_expect_success '--abbrev' '
454 echo SHORT SHORT SHORT >expect2 &&
455 echo LONG LONG LONG >expect3 &&
456 git log -1 --format="%h %h %h" HEAD >actual1 &&
457 git log -1 --abbrev=5 --format="%h %h %h" HEAD >actual2 &&
458 git log -1 --abbrev=5 --format="%H %H %H" HEAD >actual3 &&
459 sed -e "s/$OID_REGEX/LONG/g" -e "s/$_x05/SHORT/g" <actual2 >fuzzy2 &&
460 sed -e "s/$OID_REGEX/LONG/g" -e "s/$_x05/SHORT/g" <actual3 >fuzzy3 &&
461 test_cmp expect2 fuzzy2 &&
462 test_cmp expect3 fuzzy3 &&
463 ! test_cmp actual1 actual2
464'
465
466test_expect_success '%H is not affected by --abbrev-commit' '
467 expected=$(($(test_oid hexsz) + 1)) &&
468 git log -1 --format=%H --abbrev-commit --abbrev=20 HEAD >actual &&
469 len=$(wc -c <actual) &&
470 test $len = $expected
471'
472
473test_expect_success '%h is not affected by --abbrev-commit' '
474 git log -1 --format=%h --abbrev-commit --abbrev=20 HEAD >actual &&
475 len=$(wc -c <actual) &&
476 test $len = 21
477'
478
479test_expect_success '"%h %gD: %gs" is same as git-reflog' '
480 git reflog >expect &&
481 git log -g --format="%h %gD: %gs" >actual &&
482 test_cmp expect actual
483'
484
485test_expect_success '"%h %gD: %gs" is same as git-reflog (with date)' '
486 git reflog --date=raw >expect &&
487 git log -g --format="%h %gD: %gs" --date=raw >actual &&
488 test_cmp expect actual
489'
490
491test_expect_success '"%h %gD: %gs" is same as git-reflog (with --abbrev)' '
492 git reflog --abbrev=13 --date=raw >expect &&
493 git log -g --abbrev=13 --format="%h %gD: %gs" --date=raw >actual &&
494 test_cmp expect actual
495'
496
497test_expect_success '%gd shortens ref name' '
498 echo "master@{0}" >expect.gd-short &&
499 git log -g -1 --format=%gd refs/heads/master >actual.gd-short &&
500 test_cmp expect.gd-short actual.gd-short
501'
502
503test_expect_success 'reflog identity' '
504 echo "$GIT_COMMITTER_NAME:$GIT_COMMITTER_EMAIL" >expect &&
505 git log -g -1 --format="%gn:%ge" >actual &&
506 test_cmp expect actual
507'
508
509test_expect_success 'oneline with empty message' '
510 git commit --allow-empty --cleanup=verbatim -m "$LF" &&
511 git commit --allow-empty --allow-empty-message &&
512 git rev-list --oneline HEAD >test.txt &&
513 test_line_count = 5 test.txt &&
514 git rev-list --oneline --graph HEAD >testg.txt &&
515 test_line_count = 5 testg.txt
516'
517
518test_expect_success 'single-character name is parsed correctly' '
519 git commit --author="a <a@example.com>" --allow-empty -m foo &&
520 echo "a <a@example.com>" >expect &&
521 git log -1 --format="%an <%ae>" >actual &&
522 test_cmp expect actual
523'
524
525test_expect_success 'unused %G placeholders are passed through' '
526 echo "%GX %G" >expect &&
527 git log -1 --format="%GX %G" >actual &&
528 test_cmp expect actual
529'
530
531test_done