Commit cdb545af 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 47e0f007
......@@ -274,8 +274,11 @@ gpg_wrapper: |
SET gpg_kr = '--keyring ' _ path(c('gpg_keyring'), path(c('gpg_keyring_dir'))) _ ' --no-default-keyring';
END;
-%]
if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \
&& [ "$2" = '--verify' ]
# git >= 2.10.0-rc0 is calling gpg with 5 args. See #20757
if ( [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \
&& [ "$2" = '--verify' ] ) \
|| ( [ $# -eq 5 ] && [ "$1" = '--status-fd=1' ] \
&& [ "$2" = '--keyid-format=long' ] && [ "$3" = '--verify' ] )
then
[% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "$@" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /'
exit ${PIPESTATUS[0]}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment