diff options
| author | Joey Hess <joey@kitenet.net> | 2013-09-17 15:30:25 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-17 15:30:25 -0400 |
| commit | 243671037f5a36596187554712d7ed1e76e9c8b8 (patch) | |
| tree | cc7bc88b78efe489f307fe647d0cec572654c4de /git-remote-gcrypt | |
| parent | 912a827570fd01d27c8d6bb8b8aaae8c455488b9 (diff) | |
| download | git-remote-gcrypt-243671037f5a36596187554712d7ed1e76e9c8b8.tar.gz | |
add remote.<name>.gcrypt-signingkey config
This is needed by git-annex assistant when it sets up a gcrypt repository,
to ensure that the gpg key it was asked to use to encrypt the repo is the
same key used to sign it. If it's not, pulling from the repo won't work,
due to git-remote-gcrypt's "Only accepting signatories" check.
The user may have a global user.signingkey setting (I do), but be setting
up a different special-purpose key for encrypting their git repo. The
git-annex assistant cannot mess with the global value, so needs this to
override it.
Diffstat (limited to 'git-remote-gcrypt')
| -rwxr-xr-x | git-remote-gcrypt | 3 |
1 files changed, 2 insertions, 1 deletions
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 '.+' || :) |