Merge branch 'cc/fast-import-strip-signed-tags'

"git fast-import" is taught to handle signed tags, just like it
recently learned to handle signed commits, in different ways.

* cc/fast-import-strip-signed-tags:
  fast-import: add '--signed-tags=<mode>' option
  fast-export: handle all kinds of tag signatures
  t9350: properly count annotated tags
  lib-gpg: allow tests with GPGSM or GPGSSH prereq first
  doc: git-tag: stop focusing on GPG signed tags

diff --cc Documentation/git-tag.adoc
index 0f7badc,28d6fe4..cea3202
--- 1/Documentation/git-tag.adoc
--- 2/Documentation/git-tag.adoc
+++ b/Documentation/git-tag.adoc
@@@ -58,40 -60,45 +60,45 @@@ lightweight tags by default
  
  OPTIONS
  -------
 --a::
 ---annotate::
 +`-a`::
 +`--annotate`::
        Make an unsigned, annotated tag object
  
 --s::
 ---sign::
 +`-s`::
 +`--sign`::
-       Make a GPG-signed tag, using the default e-mail address's key.
-       The default behavior of tag GPG-signing is controlled by `tag.gpgSign`
-       configuration variable if it exists, or disabled otherwise.
-       See linkgit:git-config[1].
+       Make a cryptographically signed tag, using the default signing
+       key. The signing backend used depends on the `gpg.format`
+       configuration variable. The default key is determined by the
+       backend. For GPG, it's based on the committer's email address,
+       while for SSH it may be a specific key file or agent
+       identity. See linkgit:git-config[1].
  
 ---no-sign::
 +`--no-sign`::
        Override `tag.gpgSign` configuration variable that is
        set to force each and every tag to be signed.
  
 --u <key-id>::
 ---local-user=<key-id>::
 +`-u <key-id>`::
 +`--local-user=<key-id>`::
-       Make a GPG-signed tag, using the given key.
+       Make a cryptographically signed tag using the given key. The
+       format of the <key-id> and the backend used depend on the
+       `gpg.format` configuration variable. See
+       linkgit:git-config[1].
  
 --f::
 ---force::
 +`-f`::
 +`--force`::
        Replace an existing tag with the given name (instead of failing)
  
 --d::
 ---delete::
 +`-d`::
 +`--delete`::
        Delete existing tags with the given names.
  
 --v::
 ---verify::
 +`-v`::
 +`--verify`::
-       Verify the GPG signature of the given tag names.
+       Verify the cryptographic signature of the given tags.
  
 --n<num>::
 -      <num> specifies how many lines from the annotation, if any,
 -      are printed when using -l. Implies `--list`.
 +`-n<num>`::
 +      _<num>_ specifies how many lines from the annotation, if any,
 +      are printed when using `-l`. Implies `--list`.
  +
  The default is not to print any annotation lines.
  If no number is given to `-n`, only the first line is printed.

diff --cc builtin/fast-import.c
Simple merge

diff --cc t/meson.build
Simple merge