Skip to content

Commit 41a74bd

Browse files
Martin Ågrengitster
authored andcommitted
t7510: invoke git as part of &&-chain
If `git commit-tree HEAD^{tree}` fails on us and produces no output on stdout, we will substitute that empty string and execute `git tag ninth-unsigned`, i.e., we will tag HEAD rather than a newly created object. But we are lucky: we have a signature on HEAD, so we should eventually fail the next test, where we verify that "ninth-unsigned" is indeed unsigned. We have a similar problem a few lines later. If `git commit-tree -S` fails with no output, we will happily tag HEAD as "tenth-signed". Here, we are not so lucky. The tag ends up on the same commit as "eighth-signed-alt", and that's a signed commit, so t7510-signed-commit will pass, despite `git commit-tree -S` failing. Make these `git commit-tree` invocations a direct part of the &&-chain, so that we can rely less on luck and set a better example for future tests modeled after this one. Fix a 9/10 copy/paste error while at it. Signed-off-by: Martin Ågren <[email protected]> Signed-off-by: Brandon Richardson <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 16a465b commit 41a74bd

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

t/t7510-signed-commit.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,13 @@ test_expect_success GPG 'create signed commits' '
4949
git tag eighth-signed-alt &&
5050
5151
# commit.gpgsign is still on but this must not be signed
52-
git tag ninth-unsigned $(echo 9 | git commit-tree HEAD^{tree}) &&
52+
echo 9 | git commit-tree HEAD^{tree} >oid &&
53+
test_line_count = 1 oid &&
54+
git tag ninth-unsigned $(cat oid) &&
5355
# explicit -S of course must sign.
54-
git tag tenth-signed $(echo 9 | git commit-tree -S HEAD^{tree})
56+
echo 10 | git commit-tree -S HEAD^{tree} >oid &&
57+
test_line_count = 1 oid &&
58+
git tag tenth-signed $(cat oid)
5559
'
5660

5761
test_expect_success GPG 'verify and show signatures' '

0 commit comments

Comments
 (0)