diff options
| author | Joey Hess <joey@kitenet.net> | 2013-09-17 15:33:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-17 15:33:32 -0400 |
| commit | 78d42636dfc40c39c2c4a841e9f6343e2d89136f (patch) | |
| tree | beeaa101472c4e2c9fc0ee1bf09b7d12e526dba7 | |
| parent | 60a0883a3d7c30bba407fe9f8c76799495d9827b (diff) | |
| parent | 243671037f5a36596187554712d7ed1e76e9c8b8 (diff) | |
| download | git-remote-gcrypt-78d42636dfc40c39c2c4a841e9f6343e2d89136f.tar.gz | |
Merge branch 'master' into dgit/sid
| -rw-r--r-- | README.rst | 9 | ||||
| -rwxr-xr-x | git-remote-gcrypt | 3 |
2 files changed, 8 insertions, 4 deletions
@@ -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.<name>.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 '.+' || :) |