From 8726767e251fd8e4aaced6d7462d1be38c2df35a Mon Sep 17 00:00:00 2001
From: root <root@localhost>
Date: Thu, 14 Mar 2013 12:04:57 +0400
Subject: Remove deprecated config gcrypt.keyring (use gcrypt.participants or
 default)

---
 git-remote-gcrypt | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/git-remote-gcrypt b/git-remote-gcrypt
index 22ea3ab..3e62808 100755
--- a/git-remote-gcrypt
+++ b/git-remote-gcrypt
@@ -388,21 +388,12 @@ make_new_repo()
 # $1 return var for goodsig match, $2 return var for signers text
 read_config()
 {
-	local recp_= r_keyinfo= cap_= conf_keyring= conf_part= good_sig= signers_=
+	local recp_= r_keyinfo= cap_= conf_part= good_sig= signers_=
 	Conf_signkey=$(git config --path user.signingkey || :)
-	conf_keyring=$(git config --path gcrypt.keyring || :)
 	conf_part=$(git config --get "remote.$NAME.gcrypt-participants" '.+' ||
 		    git config --get gcrypt.participants '.+' || :)
 
 	# Figure out which keys we should encrypt to or accept signatures from
-	if isnonnull "$conf_keyring" && isnull "$conf_part"
-	then
-		echo_info "WARNING: Setting gcrypt.keyring is deprecated," \
-			  "use gcrypt.participants instead."
-		conf_part=$(gpg --no-default-keyring --keyring "$conf_keyring" \
-		--with-colons --fast-list -k | grep ^pub | cut -f 5 -d :)
-	fi
-
 	if isnull "$conf_part" || iseq "$conf_part" simple
 	then
 		signers_="(default keyring)"
-- 
cgit v1.1