2011-10-20 00:15:05 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='signed commit tests'
|
|
|
|
. ./test-lib.sh
|
|
|
|
. "$TEST_DIRECTORY/lib-gpg.sh"
|
|
|
|
|
|
|
|
test_expect_success GPG 'create signed commits' '
|
2013-12-16 13:55:04 +00:00
|
|
|
test_when_finished "test_unconfig commit.gpgsign" &&
|
|
|
|
|
2011-10-20 00:15:05 +00:00
|
|
|
echo 1 >file && git add file &&
|
|
|
|
test_tick && git commit -S -m initial &&
|
|
|
|
git tag initial &&
|
|
|
|
git branch side &&
|
|
|
|
|
|
|
|
echo 2 >file && test_tick && git commit -a -S -m second &&
|
|
|
|
git tag second &&
|
|
|
|
|
|
|
|
git checkout side &&
|
|
|
|
echo 3 >elif && git add elif &&
|
|
|
|
test_tick && git commit -m "third on side" &&
|
|
|
|
|
|
|
|
git checkout master &&
|
|
|
|
test_tick && git merge -S side &&
|
|
|
|
git tag merge &&
|
|
|
|
|
|
|
|
echo 4 >file && test_tick && git commit -a -m "fourth unsigned" &&
|
|
|
|
git tag fourth-unsigned &&
|
|
|
|
|
2012-01-05 18:54:14 +00:00
|
|
|
test_tick && git commit --amend -S -m "fourth signed" &&
|
2013-12-16 13:55:04 +00:00
|
|
|
git tag fourth-signed &&
|
|
|
|
|
|
|
|
git config commit.gpgsign true &&
|
|
|
|
echo 5 >file && test_tick && git commit -a -m "fifth signed" &&
|
|
|
|
git tag fifth-signed &&
|
|
|
|
|
|
|
|
git config commit.gpgsign false &&
|
|
|
|
echo 6 >file && test_tick && git commit -a -m "sixth" &&
|
|
|
|
git tag sixth-unsigned &&
|
|
|
|
|
|
|
|
git config commit.gpgsign true &&
|
|
|
|
echo 7 >file && test_tick && git commit -a -m "seventh" --no-gpg-sign &&
|
|
|
|
git tag seventh-unsigned &&
|
|
|
|
|
|
|
|
test_tick && git rebase -f HEAD^^ && git tag sixth-signed HEAD^ &&
|
|
|
|
git tag seventh-signed
|
2014-06-17 00:05:54 +00:00
|
|
|
|
|
|
|
echo 8 >file && test_tick && git commit -a -m eighth -SB7227189 &&
|
|
|
|
git tag eighth-signed-alt
|
2011-10-20 00:15:05 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success GPG 'show signatures' '
|
|
|
|
(
|
2014-06-16 23:59:59 +00:00
|
|
|
for commit in initial second merge fourth-signed fifth-signed sixth-signed seventh-signed
|
2011-10-20 00:15:05 +00:00
|
|
|
do
|
|
|
|
git show --pretty=short --show-signature $commit >actual &&
|
t7510: use consistent &&-chains in loop
We check multiple commits in a loop. Because we want to
break out of the loop if any single iteration fails, we use
a subshell/exit like:
(
for i in $stuff
do
do-something $i || exit 1
done
)
However, we are inconsistent in our loop body. Some commands
get their own "|| exit 1", and others try to chain to the
next command with "&&", like:
X &&
Y || exit 1
Z || exit 1
This is a little hard to read and follow, because X and Y
are treated differently for no good reason. But much worse,
the second loop follows a similar pattern and gets it wrong.
"Y" is expected to fail, so we use "&& exit 1", giving us:
X &&
Y && exit 1
Z || exit 1
That gets the test for X wrong (we do not exit unless both X
fails and Y unexpectedly succeeds, but we would want to exit
if _either_ is wrong). We can write this clearly and
correctly by consistently using "&&", followed by a single
"|| exit 1", and negating Y with "!" (as we would in a
normal &&-chain). Like:
X &&
! Y &&
Z || exit 1
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-06-17 00:03:43 +00:00
|
|
|
grep "Good signature from" actual &&
|
|
|
|
! grep "BAD signature from" actual &&
|
|
|
|
echo $commit OK || exit 1
|
2011-10-20 00:15:05 +00:00
|
|
|
done
|
|
|
|
) &&
|
|
|
|
(
|
2013-12-16 13:55:04 +00:00
|
|
|
for commit in merge^2 fourth-unsigned sixth-unsigned seventh-unsigned
|
2011-10-20 00:15:05 +00:00
|
|
|
do
|
|
|
|
git show --pretty=short --show-signature $commit >actual &&
|
t7510: use consistent &&-chains in loop
We check multiple commits in a loop. Because we want to
break out of the loop if any single iteration fails, we use
a subshell/exit like:
(
for i in $stuff
do
do-something $i || exit 1
done
)
However, we are inconsistent in our loop body. Some commands
get their own "|| exit 1", and others try to chain to the
next command with "&&", like:
X &&
Y || exit 1
Z || exit 1
This is a little hard to read and follow, because X and Y
are treated differently for no good reason. But much worse,
the second loop follows a similar pattern and gets it wrong.
"Y" is expected to fail, so we use "&& exit 1", giving us:
X &&
Y && exit 1
Z || exit 1
That gets the test for X wrong (we do not exit unless both X
fails and Y unexpectedly succeeds, but we would want to exit
if _either_ is wrong). We can write this clearly and
correctly by consistently using "&&", followed by a single
"|| exit 1", and negating Y with "!" (as we would in a
normal &&-chain). Like:
X &&
! Y &&
Z || exit 1
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-06-17 00:03:43 +00:00
|
|
|
! grep "Good signature from" actual &&
|
|
|
|
! grep "BAD signature from" actual &&
|
|
|
|
echo $commit OK || exit 1
|
2014-06-17 00:05:54 +00:00
|
|
|
done
|
|
|
|
) &&
|
|
|
|
(
|
|
|
|
for commit in eighth-signed-alt
|
|
|
|
do
|
|
|
|
git show --pretty=short --show-signature $commit >actual &&
|
|
|
|
grep "Good signature from" actual &&
|
|
|
|
! grep "BAD signature from" actual &&
|
|
|
|
grep "not certified" actual &&
|
|
|
|
echo $commit OK || exit 1
|
2011-10-20 00:15:05 +00:00
|
|
|
done
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success GPG 'detect fudged signature' '
|
2014-06-16 23:59:59 +00:00
|
|
|
git cat-file commit seventh-signed >raw &&
|
2011-10-20 00:15:05 +00:00
|
|
|
|
2013-12-16 13:55:04 +00:00
|
|
|
sed -e "s/seventh/7th forged/" raw >forged1 &&
|
2011-10-20 00:15:05 +00:00
|
|
|
git hash-object -w -t commit forged1 >forged1.commit &&
|
|
|
|
git show --pretty=short --show-signature $(cat forged1.commit) >actual1 &&
|
|
|
|
grep "BAD signature from" actual1 &&
|
|
|
|
! grep "Good signature from" actual1
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success GPG 'detect fudged signature with NUL' '
|
2014-06-16 23:59:59 +00:00
|
|
|
git cat-file commit seventh-signed >raw &&
|
2011-10-20 00:15:05 +00:00
|
|
|
cat raw >forged2 &&
|
|
|
|
echo Qwik | tr "Q" "\000" >>forged2 &&
|
|
|
|
git hash-object -w -t commit forged2 >forged2.commit &&
|
|
|
|
git show --pretty=short --show-signature $(cat forged2.commit) >actual2 &&
|
|
|
|
grep "BAD signature from" actual2 &&
|
|
|
|
! grep "Good signature from" actual2
|
|
|
|
'
|
|
|
|
|
2012-01-05 18:54:14 +00:00
|
|
|
test_expect_success GPG 'amending already signed commit' '
|
|
|
|
git checkout fourth-signed^0 &&
|
|
|
|
git commit --amend -S --no-edit &&
|
|
|
|
git show -s --show-signature HEAD >actual &&
|
|
|
|
grep "Good signature from" actual &&
|
|
|
|
! grep "BAD signature from" actual
|
|
|
|
'
|
|
|
|
|
2014-06-17 00:06:24 +00:00
|
|
|
test_expect_success GPG 'show good signature with custom format' '
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
G
|
|
|
|
13B6F51ECDDE430D
|
|
|
|
C O Mitter <committer@example.com>
|
|
|
|
EOF
|
|
|
|
git log -1 --format="%G?%n%GK%n%GS" sixth-signed >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success GPG 'show bad signature with custom format' '
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
B
|
|
|
|
13B6F51ECDDE430D
|
|
|
|
C O Mitter <committer@example.com>
|
|
|
|
EOF
|
|
|
|
git log -1 --format="%G?%n%GK%n%GS" $(cat forged1.commit) >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success GPG 'show unknown signature with custom format' '
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
U
|
|
|
|
61092E85B7227189
|
|
|
|
Eris Discordia <discord@example.net>
|
|
|
|
EOF
|
|
|
|
git log -1 --format="%G?%n%GK%n%GS" eighth-signed-alt >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success GPG 'show lack of signature with custom format' '
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
N
|
|
|
|
|
|
|
|
|
|
|
|
EOF
|
|
|
|
git log -1 --format="%G?%n%GK%n%GS" seventh-unsigned >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2011-10-20 00:15:05 +00:00
|
|
|
test_done
|