rename new config key

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

diff --git a/README.rst b/README.rst
index b1f12cbd8c0b72d8fde0e13821165f06620ab9df..e7cbfa6d6aeb9f12283f9ee56760f37f0d0f44ae 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -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 0cd4c0ec781750f313fbde9e7516e973f9277da9..176de31c83710dc09262fac49ae8883db3fdb681 100755 (executable)
--- 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