jigen/git-remote-gcrypt
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Remove deprecated config gcrypt.keyring (use gcrypt.participants or default)

Browse source
This commit is contained in:
root 2013-03-14 12:04:57 +04:00
parent 41d8f0d953
commit 8726767e25
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
git-remote-gcrypt
View file

@ -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)"