undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs

Browse Source 
The expected SHA-1 digests are always available in variables. Use
them instead of hardcoding.

Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alexey Shumkin 2013-06-26 14:19:46 +04:00 committed by Junio C Hamano
parent 362de916c0
commit 77a6815d7d
1 changed files with 77 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
t/t6006-rev-list-format.sh
View File

@ -7,8 +7,19 @@ test_description='git rev-list --pretty=format test'
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"
: >foo &&
git add foo &&
git commit -m "added foo" &&
head1=$(git rev-parse --verify HEAD) &&
head1_short=$(git rev-parse --verify --short $head1) &&
tree1=$(git rev-parse --verify HEAD:) &&
tree1_short=$(git rev-parse --verify --short $tree1) &&
echo changed >foo &&
git commit -a -m "changed foo" &&
head2=$(git rev-parse --verify HEAD) &&
head2_short=$(git rev-parse --verify --short $head2) &&
tree2=$(git rev-parse --verify HEAD:) &&
tree2_short=$(git rev-parse --verify --short $tree2)
'
# usage: test_format name format_string <expected_output
@ -32,49 +43,49 @@ has_no_color () {
test_cmp expect "$1"
}
test_format percent %%h <<'EOF'
commit 131a310eb913d107dd3c09a65d1651175898735d
test_format percent %%h <<EOF
commit $head2
%h
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
commit $head1
%h
EOF
test_format hash %H%n%h <<'EOF'
commit 131a310eb913d107dd3c09a65d1651175898735d
131a310eb913d107dd3c09a65d1651175898735d
131a310
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
86c75cfd708a0e5868dc876ed5b8bb66c80b4873
86c75cf
test_format hash %H%n%h <<EOF
commit $head2
$head2
$head2_short
commit $head1
$head1
$head1_short
EOF
test_format tree %T%n%t <<'EOF'
commit 131a310eb913d107dd3c09a65d1651175898735d
fe722612f26da5064c32ca3843aa154bdb0b08a0
fe72261
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
4d5fcadc293a348e88f777dc0920f11e7d71441c
4d5fcad
test_format tree %T%n%t <<EOF
commit $head2
$tree2
$tree2_short
commit $head1
$tree1
$tree1_short
EOF
test_format parents %P%n%p <<'EOF'
commit 131a310eb913d107dd3c09a65d1651175898735d
86c75cfd708a0e5868dc876ed5b8bb66c80b4873
86c75cf
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
test_format parents %P%n%p <<EOF
commit $head2
$head1
$head1_short
commit $head1
EOF
# we don't test relative here
test_format author %an%n%ae%n%ad%n%aD%n%at <<'EOF'
commit 131a310eb913d107dd3c09a65d1651175898735d
test_format author %an%n%ae%n%ad%n%aD%n%at <<EOF
commit $head2
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
commit $head1
A U Thor
author@example.com
Thu Apr 7 15:13:13 2005 -0700
@ -82,14 +93,14 @@ 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
test_format committer %cn%n%ce%n%cd%n%cD%n%ct <<EOF
commit $head2
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
commit $head1
C O Mitter
committer@example.com
Thu Apr 7 15:13:13 2005 -0700
@ -97,43 +108,43 @@ Thu, 7 Apr 2005 15:13:13 -0700
1112911993
EOF
test_format encoding %e <<'EOF'
commit 131a310eb913d107dd3c09a65d1651175898735d
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
test_format encoding %e <<EOF
commit $head2
commit $head1
EOF
test_format subject %s <<'EOF'
commit 131a310eb913d107dd3c09a65d1651175898735d
test_format subject %s <<EOF
commit $head2
changed foo
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
commit $head1
added foo
EOF
test_format body %b <<'EOF'
commit 131a310eb913d107dd3c09a65d1651175898735d
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
test_format body %b <<EOF
commit $head2
commit $head1
EOF
test_format raw-body %B <<'EOF'
commit 131a310eb913d107dd3c09a65d1651175898735d
test_format raw-body %B <<EOF
commit $head2
changed foo
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
commit $head1
added foo
EOF
test_format colors %Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy <<'EOF'
commit 131a310eb913d107dd3c09a65d1651175898735d
test_format colors %Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy <<EOF
commit $head2
foobarbazxyzzy
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
commit $head1
foobarbazxyzzy
EOF
test_format advanced-colors '%C(red yellow bold)foo%C(reset)' <<'EOF'
commit 131a310eb913d107dd3c09a65d1651175898735d
test_format advanced-colors '%C(red yellow bold)foo%C(reset)' <<EOF
commit $head2
foo
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
commit $head1
foo
EOF
@ -186,39 +197,42 @@ 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
git config i18n.commitencoding iso8859-1 &&
echo change2 >foo && git commit -a -F commit-msg &&
head3=$(git rev-parse --verify HEAD) &&
head3_short=$(git rev-parse --short $head3)
'
test_format complex-encoding %e <<'EOF'
commit 1ed88da4a5b5ed8c449114ac131efc62178734c3
test_format complex-encoding %e <<EOF
commit $head3
iso8859-1
commit 131a310eb913d107dd3c09a65d1651175898735d
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
commit $head2
commit $head1
EOF
test_format complex-subject %s <<'EOF'
commit 1ed88da4a5b5ed8c449114ac131efc62178734c3
test_format complex-subject %s <<EOF
commit $head3
Test printing of complex bodies
commit 131a310eb913d107dd3c09a65d1651175898735d
commit $head2
changed foo
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
commit $head1
added foo
EOF
test_format complex-body %b <<'EOF'
commit 1ed88da4a5b5ed8c449114ac131efc62178734c3
test_format complex-body %b <<EOF
commit $head3
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
commit $head2
commit $head1
EOF
test_expect_success '%x00 shows NUL' '
echo >expect commit 1ed88da4a5b5ed8c449114ac131efc62178734c3 &&
echo >expect commit $head3 &&
echo >>expect fooQbar &&
git rev-list -1 --format=foo%x00bar HEAD >actual.nul &&
nul_to_q <actual.nul >actual &&