diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-06-28 12:53:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-28 12:53:30 -0700 |
| commit | 078f3dc0ce9aa113ce77cfeb5e9c11b4eaa97dfe (patch) | |
| tree | d704fe81e0ecc7c4bbc35fa30f9e410ecdceff22 /t/t7612-merge-verify-signatures.sh | |
| parent | Merge branch 'as/safecrlf-quiet-fix' (diff) | |
| parent | tests: make forging GPG signed commits and tags more robust (diff) | |
| download | tgif-078f3dc0ce9aa113ce77cfeb5e9c11b4eaa97dfe.tar.xz | |
Merge branch 'sg/gpg-tests-fix'
Some flaky tests have been fixed.
* sg/gpg-tests-fix:
tests: make forging GPG signed commits and tags more robust
t7510-signed-commit: use 'test_must_fail'
Diffstat (limited to 't/t7612-merge-verify-signatures.sh')
| -rwxr-xr-x | t/t7612-merge-verify-signatures.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7612-merge-verify-signatures.sh b/t/t7612-merge-verify-signatures.sh index e797c74112..e2b1df817a 100755 --- a/t/t7612-merge-verify-signatures.sh +++ b/t/t7612-merge-verify-signatures.sh @@ -23,7 +23,7 @@ test_expect_success GPG 'create signed commits' ' echo 3 >bar && git add bar && test_tick && git commit -S -m "bad on side" && git cat-file commit side-bad >raw && - sed -e "s/bad/forged bad/" raw >forged && + sed -e "s/^bad/forged bad/" raw >forged && git hash-object -w -t commit forged >forged.commit && git checkout initial && |