aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-09-16 15:49:14 -0400
committerJoey Hess <joey@kitenet.net>2013-09-16 15:49:14 -0400
commitbb947b6a9ab35a3a10113899923dc9e2e23e3b7d (patch)
tree9d52e351485f1a2d5917aa225bf0ab3bb9b4abe7
parent4893a1ce3527da5697ae26605022908460aee501 (diff)
parent912a827570fd01d27c8d6bb8b8aaae8c455488b9 (diff)
downloadgit-remote-gcrypt-bb947b6a9ab35a3a10113899923dc9e2e23e3b7d.tar.gz
Merge branch 'master' into dgit/sid
-rwxr-xr-xgit-remote-gcrypt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-remote-gcrypt b/git-remote-gcrypt
index bb19652..182c5cb 100755
--- a/git-remote-gcrypt
+++ b/git-remote-gcrypt
@@ -313,7 +313,7 @@ CLEAN_FINAL()
ENCRYPT()
{
- gpg --batch --force-mdc --compress-algo none --passphrase-fd 3 -c 3<<EOF
+ gpg --batch --force-mdc --compress-algo none --trust-model=always --passphrase-fd 3 -c 3<<EOF
$1
EOF
}
@@ -333,7 +333,7 @@ PRIVENCRYPT()
if isnonnull "$Conf_signkey"; then
set -- "$@" -u "$Conf_signkey"
fi
- gpg --compress-algo none -se "$@"
+ gpg --compress-algo none --trust-model=always -se "$@"
}
# $1 is the match for good signature, $2 is the textual signers list