From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH] sequencer: fix edit handling for cherry-pick and revert messages
Date: Mon, 29 Mar 2021 13:52:57 -0700 [thread overview]
Message-ID: <xmqqwntpiswm.fsf@gitster.g> (raw)
In-Reply-To: <440980f5-81c9-4201-61a4-29acb0346c65@gmail.com> (Phillip Wood's message of "Mon, 29 Mar 2021 10:23:08 +0100")
Phillip Wood <phillip.wood123@gmail.com> writes:
> On 26/03/2021 07:16, Elijah Newren via GitGitGadget wrote:
>> From: Elijah Newren <newren@gmail.com>
>> save_opts() should save any non-default values. It was intended to
>> do
>> this, but since most options in struct replay_opts default to 0, it only
>> saved non-zero values. Unfortunatley,
>
> s/Unfortunatley/Unfortunately/ also s/iff/if/ in a few places below.
I think the latter is delibrate use of common abbreviation of "if
and only if".
> It might be worth emphasizing that despite its name
> continue_single_pick() is used to commit conflict resolutions
> regardless of the number of picks - I had to check the code to see
> what it was doing in the multi-pick case.
metoo ;-)
> I was surprised how big a change was required to the existing code but
> it seems this is surprising tricky to get right - I cannot think of
> any simplifications.
Thanks for a review.
next prev parent reply other threads:[~2021-03-29 20:54 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 7:16 [PATCH] sequencer: fix edit handling for cherry-pick and revert messages Elijah Newren via GitGitGadget
2021-03-26 12:27 ` Philip Oakley
2021-03-26 15:12 ` Elijah Newren
2021-03-28 1:30 ` Junio C Hamano
2021-03-29 9:23 ` Phillip Wood
2021-03-29 20:52 ` Junio C Hamano [this message]
2021-03-29 21:25 ` Elijah Newren
2021-03-30 2:09 ` [PATCH v2] " Elijah Newren via GitGitGadget
2021-03-30 10:13 ` Johannes Schindelin
2021-03-30 18:47 ` Junio C Hamano
2021-03-30 20:16 ` Elijah Newren
2021-03-31 17:36 ` Ævar Arnfjörð Bjarmason
2021-03-31 17:52 ` Elijah Newren
2021-03-31 18:01 ` Junio C Hamano
2021-04-01 16:31 ` Elijah Newren
2021-03-30 19:37 ` Elijah Newren
2021-03-31 13:48 ` unifying sequencer's options persisting, was " Johannes Schindelin
2021-04-02 11:28 ` Phillip Wood
2021-04-02 13:10 ` Phillip Wood
2021-04-02 21:01 ` Junio C Hamano
2021-04-02 22:18 ` Elijah Newren
2021-04-02 22:27 ` Junio C Hamano
2021-04-08 2:40 ` Johannes Schindelin
2021-04-08 17:45 ` Junio C Hamano
2021-04-08 19:58 ` Christian Couder
2021-04-09 13:53 ` Johannes Schindelin
2021-03-31 6:52 ` [PATCH v3] " Elijah Newren via GitGitGadget
2021-03-31 14:38 ` Johannes Schindelin
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=xmqqwntpiswm.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=newren@gmail.com \
--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.
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).