summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-02-08 17:14:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2023-02-08 17:14:42 (GMT)
commitad7fd3cc0397bc8a030742aeb4a46b9354c06998 (patch)
tree264a8b7caf12a4290ff8a272105c67b1129147b2
parenta6a323b31e2bcbac2518bddec71ea7ad558870eb (diff)
parenta9cad02538a8e0518f000ad99099193d764fe795 (diff)
downloadgit-ad7fd3cc0397bc8a030742aeb4a46b9354c06998.zip
git-ad7fd3cc0397bc8a030742aeb4a46b9354c06998.tar.gz
git-ad7fd3cc0397bc8a030742aeb4a46b9354c06998.tar.bz2
Merge branch 'gm/request-pull-with-non-pgp-signed-tags'
Adjust "git request-pull" to strip embedded signature from signed tags to notice non-PGP signatures. * gm/request-pull-with-non-pgp-signed-tags: request-pull: filter out SSH/X.509 tag signatures
-rwxr-xr-xgit-request-pull.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-request-pull.sh b/git-request-pull.sh
index 2d0e446..01640a0 100755
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
@@ -153,7 +153,7 @@ for you to fetch changes up to %H:
if test $(git cat-file -t "$head") = tag
then
git cat-file tag "$head" |
- sed -n -e '1,/^$/d' -e '/^-----BEGIN PGP /q' -e p
+ sed -n -e '1,/^$/d' -e '/^-----BEGIN \(PGP\|SSH\|SIGNED\) /q' -e p
echo
echo "----------------------------------------------------------------"
fi &&