commit --amend -S: strip existing gpgsig headers
Any existing commit signature was made against the contents of the old commit, including its committer date that is about to change, and will become invalid by amending it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
@ -24,7 +24,8 @@ test_expect_success GPG 'create signed commits' '
|
||||
echo 4 >file && test_tick && git commit -a -m "fourth unsigned" &&
|
||||
git tag fourth-unsigned &&
|
||||
|
||||
test_tick && git commit --amend -S -m "fourth signed"
|
||||
test_tick && git commit --amend -S -m "fourth signed" &&
|
||||
git tag fourth-signed
|
||||
'
|
||||
|
||||
test_expect_success GPG 'show signatures' '
|
||||
@ -68,4 +69,12 @@ test_expect_success GPG 'detect fudged signature with NUL' '
|
||||
! grep "Good signature from" actual2
|
||||
'
|
||||
|
||||
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
|
||||
'
|
||||
|
||||
test_done
|
||||
|
Reference in New Issue
Block a user