From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Sebastian Schuberth <sschuberth@gmail.com>
Subject: Re: [PATCH 3/3] sequencer: allow the commit-msg hooks to run during a `reword`
Date: Thu, 23 Mar 2017 16:49:24 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.20.1703231646430.3767@virtualbox> (raw)
In-Reply-To: <xmqq60j1kv8n.fsf@gitster.mtv.corp.google.com>
Hi Junio,
On Wed, 22 Mar 2017, Junio C Hamano wrote:
> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
>
> > diff --git a/sequencer.c b/sequencer.c
> > index 1abe559fe86..377af91c475 100644
> > --- a/sequencer.c
> > +++ b/sequencer.c
> > @@ -606,6 +606,7 @@ N_("you have staged changes in your working tree\n"
> > #define EDIT_MSG (1<<1)
> > #define AMEND_MSG (1<<2)
> > #define CLEANUP_MSG (1<<3)
> > +#define VERIFY_MSG (1<<4)
> >
> > /*
> > * If we are cherry-pick, and if the merge did not result in
> > @@ -642,8 +643,9 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts,
> > }
> >
> > argv_array_push(&cmd.args, "commit");
> > - argv_array_push(&cmd.args, "-n");
> >
> > + if (!(flags & VERIFY_MSG))
> > + argv_array_push(&cmd.args, "-n");
>
> OK, so by default we pass "--no-verify" but selected callers can
> set the bit in the flags word to disable it. That sounds sensible,
> especially given that the original callers, cherry-pick and revert,
> did want "--no-verify". "reword" in "rebase -i" is currently the
> only one we want to supress "--no-verify" and the place that does so
> are all shown in this patch.
Indeed, my reasoning was to keep the default to be the previous behavior.
> Just to see if there are other callers that may want to do the same
> suppressing of "--no-verify" as a follow-up, I looked at the whole
> file after applying the patch, and I think everything looked good
> as-is.
Thank you for being thorough; That is exactly the type of review I hoped
for. I did the same research myself, of course, but it is most reassuring
if an independent reviewer comes to the same conclusion.
> > @@ -993,7 +995,11 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
> > write_author_script(msg.message);
> > res = fast_forward_to(commit->object.oid.hash, head, unborn,
> > opts);
> > - if (res || command != TODO_REWORD)
> > + if (res)
> > + goto leave;
> > + else if (command == TODO_REWORD)
> > + flags |= VERIFY_MSG;
> > + else
> > goto leave;
>
> Both before and after are your code, but wouldn't this:
>
> if (res || command != TODO_REWORD)
> goto leave;
> + if (command == TODO_REWORD)
> + flags |= VERIFY_MSG
>
> result in smaller changes relative to the original and still be much
> easier to understand than the above?
Yes. I just did not like the repetition.
But thinking about it again, the previous logic was only concerned about
an early exit, and the clause I added is all about the flags. Therefore, I
agree with you that it should be untangled again.
v2 coming,
Dscho
next prev parent reply other threads:[~2017-03-23 15:49 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-22 15:01 [PATCH 0/3] rebase -i (reword): call the commit-msg hook again Johannes Schindelin
2017-03-22 15:01 ` [PATCH 1/3] t7504: document regression: reword no longer calls commit-msg Johannes Schindelin
2017-03-22 15:18 ` Sebastian Schuberth
2017-03-22 16:09 ` Johannes Schindelin
2017-03-22 18:15 ` Junio C Hamano
2017-03-23 14:43 ` Johannes Schindelin
2017-03-23 14:55 ` Sebastian Schuberth
2017-03-23 15:52 ` Johannes Schindelin
2017-03-22 18:12 ` Junio C Hamano
2017-03-23 14:41 ` Johannes Schindelin
2017-03-22 15:01 ` [PATCH 2/3] sequencer: make commit options more extensible Johannes Schindelin
2017-03-22 18:21 ` Junio C Hamano
2017-03-23 14:39 ` Johannes Schindelin
2017-03-23 16:04 ` Junio C Hamano
2017-03-22 15:02 ` [PATCH 3/3] sequencer: allow the commit-msg hooks to run during a `reword` Johannes Schindelin
2017-03-22 18:43 ` Junio C Hamano
2017-03-23 15:49 ` Johannes Schindelin [this message]
2017-03-23 16:07 ` [PATCH v2 0/3] rebase -i (reword): call the commit-msg hook again Johannes Schindelin
2017-03-23 16:07 ` [PATCH v2 1/3] t7504: document regression: reword no longer calls commit-msg Johannes Schindelin
2017-03-23 16:07 ` [PATCH v2 2/3] sequencer: make commit options more extensible Johannes Schindelin
2017-03-24 1:01 ` Junio C Hamano
2017-03-25 0:01 ` Johannes Schindelin
2017-03-27 0:55 ` Junio C Hamano
2017-03-27 21:03 ` Junio C Hamano
2017-03-29 12:49 ` Johannes Schindelin
2017-03-23 16:07 ` [PATCH v2 3/3] sequencer: allow the commit-msg hooks to run during a `reword` Johannes Schindelin
2017-03-23 16:51 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.20.1703231646430.3767@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sschuberth@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).