Skip to content
Snippets Groups Projects
Commit ddfbe17d authored by boklm's avatar boklm Committed by Georg Koppen
Browse files

Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0

Thanks to dcf for finding the cause of the problem.
parent cd573d8a
No related branches found
No related tags found
No related merge requests found
......@@ -8,6 +8,12 @@ if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \
then
gpgv "$1" "$3" "$4" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /'
exit ${PIPESTATUS[0]}
# git >= 2.10.0-rc0 is calling gpg with 5 args. See #20757
elif [ $# -eq 5 ] && [ "$1" = '--status-fd=1' ] \
&& [ "$2" = '--keyid-format=long' ] && [ "$3" = '--verify' ]
then
gpgv "$1" "$4" "$5" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /'
exit ${PIPESTATUS[0]}
else
exec gpg "$@"
fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment