diff --git a/README.rst b/README.rst index f177913..6fc4636 100644 --- a/README.rst +++ b/README.rst @@ -60,10 +60,13 @@ The following ``git-config(1)`` variables are supported: The ``gcrypt-participants`` setting on the remote takes precedence over the repository variable ``gcrypt.participants``. +``remote..gcrypt-signingkey`` + .. ``user.signingkey`` - (From regular git configuration) The key to use for signing. You - should set ``user.signingkey`` if your default signing key is not - part of the participant list. + (The latter from regular git configuration) The key to use for signing. + You should set ``user.signingkey`` if your default signing key is not + part of the participant list. You may use the per-remote version + to sign different remotes using different keys. Environment Variables ===================== diff --git a/git-remote-gcrypt b/git-remote-gcrypt index 182c5cb..bf75777 100755 --- a/git-remote-gcrypt +++ b/git-remote-gcrypt @@ -389,7 +389,8 @@ make_new_repo() read_config() { local recp_= r_keyinfo= 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 '.+' || :)