From: Alex Riesen <alexander.riesen@cetitec.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, Git List <git@vger.kernel.org>
Subject: Re: [PATCH] Remove negation from the merge option "--no-verify"
Date: Thu, 28 Oct 2021 08:38:04 +0200 [thread overview]
Message-ID: <YXpFTJTo0pKhM7xG@pflmari> (raw)
In-Reply-To: <xmqq4k92w7do.fsf@gitster.g>
Junio C Hamano, Wed, Oct 27, 2021 22:16:35 +0200:
> Alex Riesen <alexander.riesen@cetitec.com> writes:
>
> > From: Alex Riesen <raa.lkml@gmail.com>
> >
> > This allows re-enabling hooks disabled by an earlier "--no-verify"
> > in command-line and makes the interface more consistent.
> >
> > Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
> >
> > ---
> >
> > This one is on top of "[PATCH] Fix "commit-msg" hook unexpectedly called for
> > "git pull --no-verify" (http://public-inbox.org/git/YXfwanz3MynCLDmn@pflmari/).
> > Which is a bit awkward. Should I resend as series?
>
> Don't we need to do this at the root cause command "git commit"?
The commit preparing code in builtin/merge.c does not seem to use the code
from builtin/commit.c, so it does not look like a direct cause of that effect
in "git merge". But...
> It is documented to take "--no-verify" but not "--verify" to countermand an
> earlier "--no-verify" on the command line.
This particular peculiarity in implementation of "--[no-]verify" does look
like it has root-caused everything :)
> And yes, I agree that we shouldn't introduce an awkwardness in one
> step of the series and fix it in another step of the same series.
I think I better resend everything as a single patch then.
next prev parent reply other threads:[~2021-10-28 6:38 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-26 12:11 [PATCH] Fix "commit-msg" hook unexpectedly called for "git pull --no-verify" Alex Riesen
2021-10-26 21:16 ` Jeff King
2021-10-27 6:35 ` [PATCH v2] " Alex Riesen
2021-10-27 9:06 ` Jeff King
2021-10-27 12:09 ` [PATCH] " Alex Riesen
2021-10-27 12:19 ` Jeff King
2021-10-27 13:27 ` [PATCH] Remove negation from the merge option "--no-verify" Alex Riesen
2021-10-27 20:16 ` Junio C Hamano
2021-10-28 6:38 ` Alex Riesen [this message]
2021-10-28 8:04 ` [PATCH] Remove negation from the commit and " Alex Riesen
2021-10-28 13:57 ` Phillip Wood
2021-10-28 15:44 ` Alex Riesen
2021-10-28 15:46 ` [PATCH 2/2] Fix "commit-msg" hook unexpectedly called for "git pull --no-verify" Alex Riesen
2021-10-28 16:51 ` Junio C Hamano
2021-10-28 17:16 ` Alex Riesen
2021-10-28 19:25 ` Junio C Hamano
2021-10-29 6:34 ` Alex Riesen
2021-10-28 15:49 ` [PATCH] Remove negation from the commit and merge option "--no-verify" Alex Riesen
2021-10-29 13:32 ` Phillip Wood
2021-10-29 13:45 ` [PATCH] Document positive variant of " Alex Riesen
2021-11-01 15:34 ` Phillip Wood
2021-10-27 20:12 ` [PATCH] Fix "commit-msg" hook unexpectedly called for "git pull --no-verify" Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YXpFTJTo0pKhM7xG@pflmari \
--to=alexander.riesen@cetitec.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).