tests: make comment on GPG keyring match the code
authorChristian Hesse <mail@eworm.de>
Tue, 16 Dec 2014 08:40:05 +0000 (09:40 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Dec 2014 20:37:43 +0000 (12:37 -0800)
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>
t/lib-gpg.sh
index 33de4020f6d9975eb7a447656623a15123d92ecd..d88da29f77d23fe2f3efc86a15daf198dddbeb69 100755 (executable)
@@ -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" &&