From ea41d6c979814bc65e468f68e1f8ae33d422fe76 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 21 Jul 2020 20:09:50 -0700 Subject: shorten and tweak docs and output Signed-off-by: Sean Whitton --- README.rst | 10 +++------- git-remote-gcrypt | 6 ++++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/README.rst b/README.rst index e7cbfa6..097c05c 100644 --- a/README.rst +++ b/README.rst @@ -100,14 +100,10 @@ The following ``git-config(1)`` variables are supported: ``remote..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 176de31..5c15b60 100755 --- 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 -- cgit v1.2.3