diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-07-04 17:35:11 +0900 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-07-04 17:35:11 +0900 |
| commit | e2c5546b5d0290dbeba7018bd21ff2931ae8310a (patch) | |
| tree | dc0bde4a75d4405137c78b590ae123f8387cb6b1 /git-remote-gcrypt | |
| parent | 4e6dd11ffdbd55a72a3c2c24ea87b361bf94c29b (diff) | |
| download | git-remote-gcrypt-e2c5546b5d0290dbeba7018bd21ff2931ae8310a.tar.gz | |
GCRYPT_GPG_ARGS env var -> gcrypt.gpg-args conf
Diffstat (limited to 'git-remote-gcrypt')
| -rwxr-xr-x | git-remote-gcrypt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-remote-gcrypt b/git-remote-gcrypt index 54db709..bba6a22 100755 --- a/git-remote-gcrypt +++ b/git-remote-gcrypt @@ -372,9 +372,9 @@ rungpg() # due to trying to print messages to it, even if a gpg agent is set # up. --no-tty fixes this. if [ "x$GPG_AGENT_INFO" != "x" ]; then - ${GPG} --no-tty "${GCRYPT_GPG_ARGS:-}" "$@" + ${GPG} --no-tty "${Conf_gpg_args:-}" "$@" else - ${GPG} "${GCRYPT_GPG_ARGS:-}" "$@" + ${GPG} "${Conf_gpg_args:-}" "$@" fi } @@ -409,6 +409,7 @@ read_config() git config --get gcrypt.participants '.+' || :) Conf_pubish_participants=$(git config --get --bool "remote.$NAME.gcrypt-publish-participants" '.+' || git config --get --bool gcrypt.publish-participants || :) + Conf_gpg_args=$(git config --get gcrypt.gpg-args '.+' || :) # Figure out which keys we should encrypt to or accept signatures from if isnull "$conf_part" || iseq "$conf_part" simple |