Re: [PATCH] Fix "commit-msg" hook unexpectedly called for "git pull --no-verify"
From: Jeff King <hidden>
Date: 2021-10-27 12:19:54
On Wed, Oct 27, 2021 at 02:09:42PM +0200, Alex Riesen wrote:
Jeff King, Tue, Oct 26, 2021 23:16:09 +0200:quoted
On Tue, Oct 26, 2021 at 02:11:22PM +0200, Alex Riesen wrote: I was going to ask whether this should be passing through "verify", and allowing its "no-" variant, but there is no "--verify" in git-merge. Arguably there should be (for consistency and to countermand an earlier --no-verify), but that is outside the scope of your fix (sadly if somebody does change that, they'll have to remember to touch this spot, too, but I don't think it can be helped).This seems simple enough, though. Like this? [PATCH] Remove negation from the merge option "--no-verify" This allows re-enabling hooks disabled by an earlier "--no-verify" in command-line and makes the interface more consistent.
Yeah, I don't see any problems in the patch below, and I agree it makes things overall nicer (both the user-facing parts, and not having to see the double-negative "!no_verify" in the code).
quoted hunk ↗ jump to hunk
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 80d4831662..54cd3b04df 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt@@ -112,8 +112,9 @@ option can be used to override --squash. + With --squash, --commit is not allowed, and will fail. ---no-verify:: - This option bypasses the pre-merge and commit-msg hooks. +--[no-]verify:: + With `--no-verify`, bypass the pre-merge and commit-msg hooks, + which will be run by default.
This "which will be run by default" is a little awkward. Maybe: By default, pre-merge and commit-msg hooks are run. When `--no-verify` is given, these are bypassed. ? -Peff