summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Christian Hesse <mail@eworm.de>2014-12-16 09:40:05 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-12-16 12:37:43 -0800
commit6fb5df6c77070f7cea5391572003ecfea3235650 (patch)
tree85584b06a5de1f3f089e1f79298024e302195581
parenttests: squelch noise from GPG machinery set-up (diff)
downloadtgif-6fb5df6c77070f7cea5391572003ecfea3235650.tar.xz
tests: make comment on GPG keyring match the code
GnuPG homedir is generated on the fly and keys are imported from armored key file. Make comment match available key info and new key generation procedure. Signed-off-by: Christian Hesse <mail@eworm.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/lib-gpg.sh16
1 files changed, 13 insertions, 3 deletions
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index 33de4020f6..d88da29f77 100755
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -12,10 +12,20 @@ else
say "Your version of gpg (1.0.6) is too buggy for testing"
;;
*)
- # key generation info: gpg --homedir t/lib-gpg --gen-key
- # Type DSA and Elgamal, size 2048 bits, no expiration date.
- # Name and email: C O Mitter <committer@example.com>
+ # Available key info:
+ # * Type DSA and Elgamal, size 2048 bits, no expiration date,
+ # name and email: C O Mitter <committer@example.com>
+ # * Type RSA, size 2048 bits, no expiration date,
+ # name and email: Eris Discordia <discord@example.net>
# No password given, to enable non-interactive operation.
+ # To generate new key:
+ # gpg --homedir /tmp/gpghome --gen-key
+ # To write armored exported key to keyring:
+ # gpg --homedir /tmp/gpghome --export-secret-keys \
+ # --armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+ # To export ownertrust:
+ # gpg --homedir /tmp/gpghome --export-ownertrust \
+ # > lib-gpg/ownertrust
mkdir ./gpghome &&
chmod 0700 ./gpghome &&
GNUPGHOME="$(pwd)/gpghome" &&