shorten and tweak docs and output

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

diff --git a/README.rst b/README.rst
index e7cbfa6d6aeb9f12283f9ee56760f37f0d0f44ae..097c05c47ee6cb1888fff3e1bcfa29f79ffd9dfc 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -100,14 +100,10 @@ The following ``git-config(1)`` variables are supported:
 ``remote.<name>.gcrypt-require-explicit-force-push``
     ..
 ``gcrypt.require-explicit-force-push``
-    A known issue is that every git push effectively has a ``--force``.
+    A longstanding bug is that every git push effectively has a ``--force``.
 
-    By default, git-remote-gcrypt will warn the user of this known issue
-    when a push is requested without the ``--force`` flag.
-
-    If this flag is set to ``true``, git-remote-gcrypt will fail to push,
-    as a precaution, unless ``--force`` is passed to git or you prefix your
-    refspecs with a '+'.
+    If this flag is set to ``true``, git-remote-gcrypt will refuse to push,
+    unless ``--force`` is passed, or refspecs are prefixed with ``+``.
 
 Environment variables
 =====================

diff --git a/git-remote-gcrypt b/git-remote-gcrypt
index 176de31c83710dc09262fac49ae8883db3fdb681..5c15b609841b5d127c7b54a3d8a9268c1a086f32 100755 (executable)
--- a/git-remote-gcrypt
+++ b/git-remote-gcrypt
@@ -773,9 +773,11 @@ EOF
        then
                if [ "$Conf_force_required" = true ]
                then
-                       echo_die "gcrypt.force-required is set to true.  Explicitly force push by passing --force in order to override this error."
+                       echo_die "Implicit force push disallowed by gcrypt configuration."
                else
-                       echo_info "An implicit --force push is occuring. Please set 'git config --global add gcrypt.force-required true' to protect from implicit force pushes."
+                       echo_info "Due to a longstanding bug, this push implicitly has --force."
+                       echo_info "Consider explicitly passing --force, and setting"
+                       echo_info "gcrypt's require-explicit-force-push git config key."
                fi
        fi