From: Joey Hess <joey@kitenet.net>
Date: Thu, 19 Sep 2013 17:00:58 +0000 (-0400)
Subject: Merge branch 'better_signature_validation' of https://github.com/jburnham/git-remote... 
X-Git-Url: https://git.nutra.tk/v2?a=commitdiff_plain;h=29ed089ccee73925eb34d35f5ebdfb5706a8d7d7;p=gamesguru%2Fgit-remote-gcrypt.git

Merge branch 'better_signature_validation' of https://github.com/jburnham/git-remote-gcrypt
---

29ed089ccee73925eb34d35f5ebdfb5706a8d7d7
diff --cc git-remote-gcrypt
index 67b0f67,94e7d58..87db2a1
--- a/git-remote-gcrypt
+++ b/git-remote-gcrypt
@@@ -388,9 -388,8 +388,9 @@@ make_new_repo(
  # $1 return var for goodsig match, $2 return var for signers text
  read_config()
  {
- 	local recp_= r_keyinfo= cap_= conf_part= good_sig= signers_=
+ 	local recp_= r_keyinfo= r_keyfpr= gpg_list= cap_= conf_part= good_sig= signers_=
 -	Conf_signkey=$(git config --path user.signingkey || :)
 +	Conf_signkey=$(git config --get "remote.$NAME.gcrypt-signingkey" '.+' ||
 +		git config --path user.signingkey || :)
  	conf_part=$(git config --get "remote.$NAME.gcrypt-participants" '.+' ||
  		    git config --get gcrypt.participants '.+' || :)