mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'tz/gpg-test-fix'
Test fix. * tz/gpg-test-fix: t/lib-gpg: drop redundant killing of gpg-agent t/lib-gpg: quote path to ${GNUPGHOME}/trustlist.txt
This commit is contained in:
commit
154f22014b
|
@ -63,8 +63,7 @@ then
|
||||||
cut -d" " -f4 |
|
cut -d" " -f4 |
|
||||||
tr -d '\n' >"${GNUPGHOME}/trustlist.txt" &&
|
tr -d '\n' >"${GNUPGHOME}/trustlist.txt" &&
|
||||||
|
|
||||||
echo " S relax" >> ${GNUPGHOME}/trustlist.txt &&
|
echo " S relax" >>"${GNUPGHOME}/trustlist.txt" &&
|
||||||
(gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
|
|
||||||
echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
|
echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
|
||||||
-u committer@example.com -o /dev/null --sign - 2>&1 &&
|
-u committer@example.com -o /dev/null --sign - 2>&1 &&
|
||||||
test_set_prereq GPGSM
|
test_set_prereq GPGSM
|
||||||
|
|
Loading…
Reference in a new issue