diff options
| author | root <root@localhost> | 2013-03-14 12:04:57 +0400 |
|---|---|---|
| committer | root <root@localhost> | 2013-03-14 12:04:57 +0400 |
| commit | 8726767e251fd8e4aaced6d7462d1be38c2df35a (patch) | |
| tree | 6c0ae53af1fdb3d2f7a27a61b0e99484a3783fb2 | |
| parent | 41d8f0d95398bf82a73da75d6b6e5e2b50c17722 (diff) | |
| download | git-remote-gcrypt-8726767e251fd8e4aaced6d7462d1be38c2df35a.zip git-remote-gcrypt-8726767e251fd8e4aaced6d7462d1be38c2df35a.tar.gz git-remote-gcrypt-8726767e251fd8e4aaced6d7462d1be38c2df35a.tar.bz2 | |
Remove deprecated config gcrypt.keyring (use gcrypt.participants or default)
| -rwxr-xr-x | git-remote-gcrypt | 11 |
1 files changed, 1 insertions, 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)" |