git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Fix "commit-msg" hook unexpectedly called for "git pull --no-verify"

From
Jeff King <peff@peff.net>
Date
Oct 27, 2021, 12:19 UTC
Message-ID
<YXlD5ecNSdeBSMoS@coredump.intra.peff.net>
In-Reply-To
<YXlBhmfXl3wFQ5Bj@pflmari>
On Wed, Oct 27, 2021 at 02:09:42PM +0200, Alex Riesen wrote:
Show 15 quoted lines
> Jeff King, Tue, Oct 26, 2021 23:16:09 +0200:
> > 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).

Show 13 quoted lines
> 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
Previous: Alex RiesenNext: Alex Riesen
Message 6 of 22 in “Fix "commit-msg" hook unexpectedly called for "git pull --no-verify"”
  1. Fix "commit-msg" hook unexpectedly called for "git pull --no-verify"Alex Riesen, Oct 26, 2021
  2. Jeff KingOct 26, 2021
  3. Fix "commit-msg" hook unexpectedly called for "git pull --no-verify"Alex Riesen, Oct 27, 2021
  4. Jeff KingOct 27, 2021
  5. Alex RiesenOct 27, 2021
  6. Jeff KingOct 27, 2021
  7. Remove negation from the merge option "--no-verify"Alex Riesen, Oct 27, 2021
  8. Junio C HamanoOct 27, 2021
  9. Alex RiesenOct 28, 2021
  10. Remove negation from the commit and merge option "--no-verify"Alex Riesen, Oct 28, 2021
  11. Phillip WoodOct 28, 2021
  12. Alex RiesenOct 28, 2021
  13. 2/2 Fix "commit-msg" hook unexpectedly called for "git pull --no-verify"Alex Riesen, Oct 28, 2021
  14. Junio C HamanoOct 28, 2021
  15. Alex RiesenOct 28, 2021
  16. Junio C HamanoOct 28, 2021
  17. Alex RiesenOct 29, 2021
  18. Alex RiesenOct 28, 2021
  19. Phillip WoodOct 29, 2021
  20. Document positive variant of commit and merge option "--no-verify"Alex Riesen, Oct 29, 2021
  21. Phillip WoodNov 1, 2021
  22. Junio C HamanoOct 27, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.