mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tz/gpg-test-fix'

Browse Source 
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:
Junio C Hamano
2019-02-08 20:44:50 -08:00
parent d379d46419 2e285e7803
commit 154f22014b
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
t/lib-gpg.sh
View File

@ -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