mirror of
https://github.com/git/git.git
synced 2024-10-30 13:57:54 +01:00
cd1957f5fc
When doing a reflog walk, you can get some information about the reflog (such as the subject line), but not the identity information (i.e., name and email). Let's make those available, mimicing the options for author and committer identity. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
285 lines
7.7 KiB
Bash
Executable file
285 lines
7.7 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 &&
|
|
test_cmp expect.$1 output.$1
|
|
"
|
|
}
|
|
|
|
test_format percent %%h <<'EOF'
|
|
commit 131a310eb913d107dd3c09a65d1651175898735d
|
|
%h
|
|
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
|
%h
|
|
EOF
|
|
|
|
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 raw-body %B <<'EOF'
|
|
commit 131a310eb913d107dd3c09a65d1651175898735d
|
|
changed foo
|
|
|
|
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
|
added foo
|
|
|
|
EOF
|
|
|
|
test_format colors %Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy <<'EOF'
|
|
commit 131a310eb913d107dd3c09a65d1651175898735d
|
|
[31mfoo[32mbar[34mbaz[mxyzzy
|
|
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
|
[31mfoo[32mbar[34mbaz[mxyzzy
|
|
EOF
|
|
|
|
test_format advanced-colors '%C(red yellow bold)foo%C(reset)' <<'EOF'
|
|
commit 131a310eb913d107dd3c09a65d1651175898735d
|
|
[1;31;43mfoo[m
|
|
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
|
[1;31;43mfoo[m
|
|
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_expect_success '%x00 shows NUL' '
|
|
echo >expect commit f58db70b055c5718631e5c61528b28b12090cdea &&
|
|
echo >>expect fooQbar &&
|
|
git rev-list -1 --format=foo%x00bar HEAD >actual.nul &&
|
|
nul_to_q <actual.nul >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '%ad respects --date=' '
|
|
echo 2005-04-07 >expect.ad-short &&
|
|
git log -1 --date=short --pretty=tformat:%ad >output.ad-short master &&
|
|
test_cmp expect.ad-short output.ad-short
|
|
'
|
|
|
|
test_expect_success 'empty email' '
|
|
test_tick &&
|
|
C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) &&
|
|
A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) &&
|
|
test "$A" = "A U Thor,,Thu Apr 7 15:14:13 2005 -0700" || {
|
|
echo "Eh? $A" >failure
|
|
false
|
|
}
|
|
'
|
|
|
|
test_expect_success 'del LF before empty (1)' '
|
|
git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD^^ >actual &&
|
|
test $(wc -l <actual) = 2
|
|
'
|
|
|
|
test_expect_success 'del LF before empty (2)' '
|
|
git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD >actual &&
|
|
test $(wc -l <actual) = 6 &&
|
|
grep "^$" actual
|
|
'
|
|
|
|
test_expect_success 'add LF before non-empty (1)' '
|
|
git show -s --pretty=format:"%s%+b%nThanks%n" HEAD^^ >actual &&
|
|
test $(wc -l <actual) = 2
|
|
'
|
|
|
|
test_expect_success 'add LF before non-empty (2)' '
|
|
git show -s --pretty=format:"%s%+b%nThanks%n" HEAD >actual &&
|
|
test $(wc -l <actual) = 6 &&
|
|
grep "^$" actual
|
|
'
|
|
|
|
test_expect_success 'add SP before non-empty (1)' '
|
|
git show -s --pretty=format:"%s% bThanks" HEAD^^ >actual &&
|
|
test $(wc -w <actual) = 2
|
|
'
|
|
|
|
test_expect_success 'add SP before non-empty (2)' '
|
|
git show -s --pretty=format:"%s% sThanks" HEAD^^ >actual &&
|
|
test $(wc -w <actual) = 4
|
|
'
|
|
|
|
test_expect_success '--abbrev' '
|
|
echo SHORT SHORT SHORT >expect2 &&
|
|
echo LONG LONG LONG >expect3 &&
|
|
git log -1 --format="%h %h %h" HEAD >actual1 &&
|
|
git log -1 --abbrev=5 --format="%h %h %h" HEAD >actual2 &&
|
|
git log -1 --abbrev=5 --format="%H %H %H" HEAD >actual3 &&
|
|
sed -e "s/$_x40/LONG/g" -e "s/$_x05/SHORT/g" <actual2 >fuzzy2 &&
|
|
sed -e "s/$_x40/LONG/g" -e "s/$_x05/SHORT/g" <actual3 >fuzzy3 &&
|
|
test_cmp expect2 fuzzy2 &&
|
|
test_cmp expect3 fuzzy3 &&
|
|
! test_cmp actual1 actual2
|
|
'
|
|
|
|
test_expect_success '%H is not affected by --abbrev-commit' '
|
|
git log -1 --format=%H --abbrev-commit --abbrev=20 HEAD >actual &&
|
|
len=$(wc -c <actual) &&
|
|
test $len = 41
|
|
'
|
|
|
|
test_expect_success '%h is not affected by --abbrev-commit' '
|
|
git log -1 --format=%h --abbrev-commit --abbrev=20 HEAD >actual &&
|
|
len=$(wc -c <actual) &&
|
|
test $len = 21
|
|
'
|
|
|
|
test_expect_success '"%h %gD: %gs" is same as git-reflog' '
|
|
git reflog >expect &&
|
|
git log -g --format="%h %gD: %gs" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '"%h %gD: %gs" is same as git-reflog (with date)' '
|
|
git reflog --date=raw >expect &&
|
|
git log -g --format="%h %gD: %gs" --date=raw >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '"%h %gD: %gs" is same as git-reflog (with --abbrev)' '
|
|
git reflog --abbrev=13 --date=raw >expect &&
|
|
git log -g --abbrev=13 --format="%h %gD: %gs" --date=raw >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '%gd shortens ref name' '
|
|
echo "master@{0}" >expect.gd-short &&
|
|
git log -g -1 --format=%gd refs/heads/master >actual.gd-short &&
|
|
test_cmp expect.gd-short actual.gd-short
|
|
'
|
|
|
|
test_expect_success 'reflog identity' '
|
|
echo "C O Mitter:committer@example.com" >expect &&
|
|
git log -g -1 --format="%gn:%ge" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'oneline with empty message' '
|
|
git commit -m "dummy" --allow-empty &&
|
|
git commit -m "dummy" --allow-empty &&
|
|
git filter-branch --msg-filter "sed -e s/dummy//" HEAD^^.. &&
|
|
git rev-list --oneline HEAD >test.txt &&
|
|
test $(git rev-list --oneline HEAD | wc -l) -eq 5 &&
|
|
test $(git rev-list --oneline --graph HEAD | wc -l) -eq 5
|
|
'
|
|
|
|
test_done
|