diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2020-07-21 20:09:41 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-07-24 15:35:09 -0700 |
| commit | 38d6f051ee2c4e6bffb4f6dec55e8853f1eb96f9 (patch) | |
| tree | 8ed8dfb1b6c2ce96bff707850eea092ffae16fb2 | |
| parent | 323db9eacf7f984727ca84692b98413fc4c1528d (diff) | |
| download | git-remote-gcrypt-38d6f051ee2c4e6bffb4f6dec55e8853f1eb96f9.tar.gz | |
rename new config key
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| -rw-r--r-- | README.rst | 4 | ||||
| -rwxr-xr-x | git-remote-gcrypt | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -97,9 +97,9 @@ The following ``git-config(1)`` variables are supported: ``rsync://`` backend. If the flags are set to a specific remote, the global flags, if also set, will not be applied for that remote. -``remote.<name>.gcrypt-force-required`` +``remote.<name>.gcrypt-require-explicit-force-push`` .. -``gcrypt.force-required`` +``gcrypt.require-explicit-force-push`` A known issue is that every git push effectively has a ``--force``. By default, git-remote-gcrypt will warn the user of this known issue diff --git a/git-remote-gcrypt b/git-remote-gcrypt index 0cd4c0e..176de31 100755 --- a/git-remote-gcrypt +++ b/git-remote-gcrypt @@ -432,8 +432,8 @@ read_config() Conf_gpg_args=$(git config --get gcrypt.gpg-args '.+' || :) Conf_rsync_put_flags=$(git config --get "remote.$NAME.gcrypt-rsync-put-flags" '.+' || git config --get "gcrypt.rsync-put-flags" '.+' || :) - Conf_force_required=$(git config --get --bool "remote.$NAME.gcrypt-force-required" '.+' || - git config --get --bool gcrypt.force-required '.+' || :) + Conf_force_required=$(git config --get --bool "remote.$NAME.gcrypt-require-explicit-force-push" '.+' || + git config --get --bool gcrypt.require-explicit-force-push '.+' || :) # Figure out which keys we should encrypt to or accept signatures from if isnull "$conf_part" || iseq "$conf_part" simple |