mirror of
https://github.com/git/git.git
synced 2024-11-13 20:53:02 +01:00
55246aac67
This changes the interporate() to replace entries with NULL values by the empty string, and uses it to interpolate missing fields in custom format output used in git-log and friends. It is most useful to avoid <unknown> output from %b format for a commit log message that lack any body text. Signed-off-by: Junio C Hamano <gitster@pobox.com>
142 lines
3.5 KiB
Bash
Executable file
142 lines
3.5 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git rev-list --pretty=format test'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_tick
|
|
test_expect_success 'setup' '
|
|
touch foo && git add foo && git-commit -m "added foo" &&
|
|
echo changed >foo && git-commit -a -m "changed foo"
|
|
'
|
|
|
|
# usage: test_format name format_string <expected_output
|
|
test_format() {
|
|
cat >expect.$1
|
|
test_expect_success "format $1" "
|
|
git rev-list --pretty=format:$2 master >output.$1 &&
|
|
git diff expect.$1 output.$1
|
|
"
|
|
}
|
|
|
|
test_format hash %H%n%h <<'EOF'
|
|
commit 131a310eb913d107dd3c09a65d1651175898735d
|
|
131a310eb913d107dd3c09a65d1651175898735d
|
|
131a310
|
|
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
|
86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
|
86c75cf
|
|
EOF
|
|
|
|
test_format tree %T%n%t <<'EOF'
|
|
commit 131a310eb913d107dd3c09a65d1651175898735d
|
|
fe722612f26da5064c32ca3843aa154bdb0b08a0
|
|
fe72261
|
|
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
|
4d5fcadc293a348e88f777dc0920f11e7d71441c
|
|
4d5fcad
|
|
EOF
|
|
|
|
test_format parents %P%n%p <<'EOF'
|
|
commit 131a310eb913d107dd3c09a65d1651175898735d
|
|
86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
|
86c75cf
|
|
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
|
|
|
|
|
EOF
|
|
|
|
# we don't test relative here
|
|
test_format author %an%n%ae%n%ad%n%aD%n%at <<'EOF'
|
|
commit 131a310eb913d107dd3c09a65d1651175898735d
|
|
A U Thor
|
|
author@example.com
|
|
Thu Apr 7 15:13:13 2005 -0700
|
|
Thu, 7 Apr 2005 15:13:13 -0700
|
|
1112911993
|
|
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
|
A U Thor
|
|
author@example.com
|
|
Thu Apr 7 15:13:13 2005 -0700
|
|
Thu, 7 Apr 2005 15:13:13 -0700
|
|
1112911993
|
|
EOF
|
|
|
|
test_format committer %cn%n%ce%n%cd%n%cD%n%ct <<'EOF'
|
|
commit 131a310eb913d107dd3c09a65d1651175898735d
|
|
C O Mitter
|
|
committer@example.com
|
|
Thu Apr 7 15:13:13 2005 -0700
|
|
Thu, 7 Apr 2005 15:13:13 -0700
|
|
1112911993
|
|
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
|
C O Mitter
|
|
committer@example.com
|
|
Thu Apr 7 15:13:13 2005 -0700
|
|
Thu, 7 Apr 2005 15:13:13 -0700
|
|
1112911993
|
|
EOF
|
|
|
|
test_format encoding %e <<'EOF'
|
|
commit 131a310eb913d107dd3c09a65d1651175898735d
|
|
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
|
EOF
|
|
|
|
test_format subject %s <<'EOF'
|
|
commit 131a310eb913d107dd3c09a65d1651175898735d
|
|
changed foo
|
|
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
|
added foo
|
|
EOF
|
|
|
|
test_format body %b <<'EOF'
|
|
commit 131a310eb913d107dd3c09a65d1651175898735d
|
|
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
|
EOF
|
|
|
|
test_format colors %Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy <<'EOF'
|
|
commit 131a310eb913d107dd3c09a65d1651175898735d
|
|
[31mfoo[32mbar[34mbaz[mxyzzy
|
|
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
|
[31mfoo[32mbar[34mbaz[mxyzzy
|
|
EOF
|
|
|
|
cat >commit-msg <<'EOF'
|
|
Test printing of complex bodies
|
|
|
|
This commit message is much longer than the others,
|
|
and it will be encoded in iso8859-1. We should therefore
|
|
include an iso8859 character: ¡bueno!
|
|
EOF
|
|
test_expect_success 'setup complex body' '
|
|
git config i18n.commitencoding iso8859-1 &&
|
|
echo change2 >foo && git-commit -a -F commit-msg
|
|
'
|
|
|
|
test_format complex-encoding %e <<'EOF'
|
|
commit f58db70b055c5718631e5c61528b28b12090cdea
|
|
iso8859-1
|
|
commit 131a310eb913d107dd3c09a65d1651175898735d
|
|
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
|
EOF
|
|
|
|
test_format complex-subject %s <<'EOF'
|
|
commit f58db70b055c5718631e5c61528b28b12090cdea
|
|
Test printing of complex bodies
|
|
commit 131a310eb913d107dd3c09a65d1651175898735d
|
|
changed foo
|
|
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
|
added foo
|
|
EOF
|
|
|
|
test_format complex-body %b <<'EOF'
|
|
commit f58db70b055c5718631e5c61528b28b12090cdea
|
|
This commit message is much longer than the others,
|
|
and it will be encoded in iso8859-1. We should therefore
|
|
include an iso8859 character: ¡bueno!
|
|
|
|
commit 131a310eb913d107dd3c09a65d1651175898735d
|
|
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
|
EOF
|
|
|
|
test_done
|