From: Taylor Blau <me@ttaylorr.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: Taylor Blau <me@ttaylorr.com>,
Cameron Steffen <cam.steffen94@gmail.com>,
git@vger.kernel.org
Subject: Re: git revert --continue --no-verify
Date: Wed, 4 Aug 2021 21:40:11 -0400 [thread overview]
Message-ID: <YQtBezRE3l09cILa@nand.local> (raw)
In-Reply-To: <74443c64-efe9-ea47-e918-d62b8c976abc@gmail.com>
On Wed, Aug 04, 2021 at 07:14:34PM +0100, Phillip Wood wrote:
> [...] I wouldn't be opposed to someone adding support for --no-verify
> (and --no-edit) to "cherry-pick/revert/rebase --continue" on the
> understanding that it only applied when committing the conflict
> resolution. There is a possible confusion for users though who might
> expect that the options passed with '--continue' applied to all the
> commits made by the command.
Yeah, that feels like we are just trying to confuse the user ;). So I
agree that I'd rather not go any further along that direction.
> do_commit() does not change the flags that it is called with - callers that
> want VERIFY_MSG will set that before they call do_commit(). do_commit() is
> there to commit simple picks without forking 'git commit'
>
> > So I suspect that this is an oversight, but perhaps somebody more
> > familiar with this code could confirm my thinking.
>
> I hope the above helps - basically the idea is "if the commit has been
> edited use VERIFY_MSG" and --continue unhelpfully uses a completely
> different code-path to the main commit picking/reverting loop.
Makes sense, thanks.
Taylor
next prev parent reply other threads:[~2021-08-05 1:40 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-03 19:17 git revert --continue --no-verify Cameron Steffen
2021-08-03 20:50 ` Taylor Blau
2021-08-03 20:56 ` Cameron Steffen
2021-08-03 20:59 ` Taylor Blau
2021-08-03 21:33 ` Cameron Steffen
2021-08-03 22:07 ` Taylor Blau
2021-08-04 0:38 ` Junio C Hamano
2021-08-04 18:14 ` Phillip Wood
2021-08-05 1:40 ` Taylor Blau [this message]
2021-08-05 1:56 ` Cameron Steffen
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=YQtBezRE3l09cILa@nand.local \
--to=me@ttaylorr.com \
--cc=cam.steffen94@gmail.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.