Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'tz/gpg-test-fix'
author
Junio C Hamano
<gitster@pobox.com>
Sat, 9 Feb 2019 04:44:50 +0000
(20:44 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Sat, 9 Feb 2019 04:44:51 +0000
(20:44 -0800)
Test fix.
* tz/gpg-test-fix:
t/lib-gpg: drop redundant killing of gpg-agent
t/lib-gpg: quote path to ${GNUPGHOME}/trustlist.txt
t/lib-gpg.sh
patch
|
blob
|
history
raw
(from parent 1:
d379d46
)
diff --git
a/t/lib-gpg.sh
b/t/lib-gpg.sh
index f1277bef4fa65e72607ea1f2dac326048559e6aa..8d28652b729b46cb08de8ddd4347dddda9e246a7 100755
(executable)
--- a/
t/lib-gpg.sh
+++ b/
t/lib-gpg.sh
@@
-63,8
+63,7
@@
then
cut -d" " -f4 |
tr -d '\n' >"${GNUPGHOME}/trustlist.txt" &&
- echo " S relax" >> ${GNUPGHOME}/trustlist.txt &&
- (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
+ echo " S relax" >>"${GNUPGHOME}/trustlist.txt" &&
echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
-u committer@example.com -o /dev/null --sign - 2>&1 &&
test_set_prereq GPGSM