From: Phillip Wood <phillip.wood123@gmail.com>
To: Elijah Newren <newren@gmail.com>
Cc: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>,
git@vger.kernel.org, "Derrick Stolee" <derrickstolee@github.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Martin Ågren" <martin.agren@gmail.com>,
"Phillip Wood" <phillip.wood123@gmail.com>
Subject: Re: [PATCH v4 5/9] rebase: add coverage of other incompatible options
Date: Tue, 24 Jan 2023 19:21:18 +0000 [thread overview]
Message-ID: <83c489c6-7927-ee3a-03bb-7896a928c280@dunelm.org.uk> (raw)
In-Reply-To: <CABPp-BEwv+cRMOR_-kz_UhfQt1+SGRdhictLmwmq=122LYZaDw@mail.gmail.com>
On 24/01/2023 17:12, Elijah Newren wrote:
> On Tue, Jan 24, 2023 at 8:48 AM Phillip Wood <phillip.wood123@gmail.com> wrote:
>>>> + options.reapply_cherry_picks = keep_base;
>>>> + else if (!keep_base)
>>>> + /*
>>>> + * --keep-base implements --reapply-cherry-picks by
>>>
>>> Should this be --[no-]reapply-cherry-picks, to clarify that it handles
>>> both cases? Especially given how many times I missed it?
>>
>> This has obviously proved to be confusing. The aim was to explain that
>> in order to work with the apply backend "[--reapply-cherry-picks]
>> --keep-base" was doing something unusual with `upstream` to reapply
>> cherry picks. "--no-reapply-cherry-picks --keep-base" does not do
>> anything unusual with `upstream`. I don't think changing it to
>> --[no-]reapply-cherry-picks quite captures that. I came up with
>>
>> To support --reapply-cherry-picks (which is not supported by the apply
>> backend) --keep-base alters upstream to prevent cherry picked commits
>> from being dropped.
>>
>> but it really needs to mention that --keep-base also supports
>> --no-reapply-cherry-picks in the usual way
>
> Somewhat wordy, but perhaps:
>
> /*
> * The apply backend always searches for and drops cherry
> * picks. This is often not wanted with --keep-base, so
> * --keep-base allows --reapply-cherry-picks to be
> * simulated by altering the upstream such that
> * cherry-picks cannot be detected and thus all commits are
> * reapplied. Thus, --[no-]reapply-cherry-picks is
> * supported when --keep-base is specified, but not when
> * --keep-base is left out.
> */
That sounds good to me, it is definitely an improvement on the current
comment which I think is too terse.
Best Wishes
Phillip
next prev parent reply other threads:[~2023-01-24 19:21 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 5:36 [PATCH] rebase: mark --update-refs as requiring the merge backend Elijah Newren via GitGitGadget
2023-01-19 21:47 ` Derrick Stolee
2023-01-20 1:54 ` Elijah Newren
2023-01-20 15:27 ` Junio C Hamano
2023-01-20 16:47 ` Elijah Newren
2023-01-20 4:56 ` [PATCH v2 0/2] " Elijah Newren via GitGitGadget
2023-01-20 4:56 ` [PATCH v2 1/2] rebase: remove completely useless -C option Elijah Newren via GitGitGadget
2023-01-20 5:40 ` Eric Sunshine
2023-01-20 6:42 ` Elijah Newren
2023-01-20 9:55 ` Martin Ågren
2023-01-20 15:32 ` Elijah Newren
2023-01-20 12:05 ` Junio C Hamano
2023-01-20 15:31 ` Elijah Newren
2023-01-20 16:15 ` Junio C Hamano
2023-01-21 4:52 ` Elijah Newren
2023-01-22 0:02 ` Junio C Hamano
2023-01-20 4:56 ` [PATCH v2 2/2] rebase: mark --update-refs as requiring the merge backend Elijah Newren via GitGitGadget
2023-01-20 16:46 ` Phillip Wood
2023-01-21 1:34 ` Elijah Newren
2023-01-21 1:55 ` [PATCH v3 0/7] rebase: fix several code/testing/documentation issues around flag incompatibilities Elijah Newren via GitGitGadget
2023-01-21 1:55 ` [PATCH v3 1/7] rebase: mark --update-refs as requiring the merge backend Elijah Newren via GitGitGadget
2023-01-21 1:55 ` [PATCH v3 2/7] rebase: flag --apply and --merge as incompatible Elijah Newren via GitGitGadget
2023-01-21 1:55 ` [PATCH v3 3/7] rebase: remove --allow-empty-message from incompatible opts Elijah Newren via GitGitGadget
2023-01-21 15:09 ` Phillip Wood
2023-01-21 1:55 ` [PATCH v3 4/7] rebase: fix docs about incompatibilities with --root Elijah Newren via GitGitGadget
2023-01-21 1:55 ` [PATCH v3 5/7] rebase: add coverage of other incompatible options Elijah Newren via GitGitGadget
2023-01-21 15:20 ` Phillip Wood
2023-01-21 19:25 ` Phillip Wood
2023-01-22 5:11 ` Elijah Newren
2023-01-21 1:55 ` [PATCH v3 6/7] rebase: clarify the OPT_CMDMODE incompatibilities Elijah Newren via GitGitGadget
2023-01-21 1:55 ` [PATCH v3 7/7] rebase: fix formatting of rebase --reapply-cherry-picks option in docs Elijah Newren via GitGitGadget
2023-01-21 15:21 ` Phillip Wood
2023-01-22 6:12 ` [PATCH v4 0/9] rebase: fix several code/testing/documentation issues around flag incompatibilities Elijah Newren via GitGitGadget
2023-01-22 6:12 ` [PATCH v4 1/9] rebase: mark --update-refs as requiring the merge backend Elijah Newren via GitGitGadget
2023-01-22 6:12 ` [PATCH v4 2/9] rebase: flag --apply and --merge as incompatible Elijah Newren via GitGitGadget
2023-01-22 6:12 ` [PATCH v4 3/9] rebase: remove --allow-empty-message from incompatible opts Elijah Newren via GitGitGadget
2023-01-22 6:12 ` [PATCH v4 4/9] rebase: fix docs about incompatibilities with --root Elijah Newren via GitGitGadget
2023-01-22 6:12 ` [PATCH v4 5/9] rebase: add coverage of other incompatible options Elijah Newren via GitGitGadget
2023-01-23 20:08 ` Phillip Wood
2023-01-24 2:36 ` Elijah Newren
2023-01-24 10:27 ` Phillip Wood
2023-01-24 13:16 ` Phillip Wood
2023-01-24 14:48 ` Junio C Hamano
2023-01-24 15:41 ` Elijah Newren
2023-01-24 16:48 ` Phillip Wood
2023-01-24 17:12 ` Elijah Newren
2023-01-24 19:21 ` Phillip Wood [this message]
2023-01-22 6:12 ` [PATCH v4 6/9] rebase: clarify the OPT_CMDMODE incompatibilities Elijah Newren via GitGitGadget
2023-01-22 6:12 ` [PATCH v4 7/9] rebase: fix formatting of rebase --reapply-cherry-picks option in docs Elijah Newren via GitGitGadget
2023-01-22 6:12 ` [PATCH v4 8/9] rebase: put rebase_options initialization in single place Elijah Newren via GitGitGadget
2023-01-22 6:12 ` [PATCH v4 9/9] rebase: provide better error message for apply options vs. merge config Elijah Newren via GitGitGadget
2023-01-23 15:56 ` [PATCH v4 0/9] rebase: fix several code/testing/documentation issues around flag incompatibilities Derrick Stolee
2023-01-24 2:05 ` Elijah Newren
2023-01-25 4:03 ` [PATCH v5 00/10] " Elijah Newren via GitGitGadget
2023-01-25 4:03 ` [PATCH v5 01/10] rebase: mark --update-refs as requiring the merge backend Elijah Newren via GitGitGadget
2023-01-25 4:03 ` [PATCH v5 02/10] rebase: flag --apply and --merge as incompatible Elijah Newren via GitGitGadget
2023-01-25 4:03 ` [PATCH v5 03/10] rebase: remove --allow-empty-message from incompatible opts Elijah Newren via GitGitGadget
2023-01-25 4:03 ` [PATCH v5 04/10] rebase: fix docs about incompatibilities with --root Elijah Newren via GitGitGadget
2023-01-25 4:03 ` [PATCH v5 05/10] rebase: fix incompatiblity checks for --[no-]reapply-cherry-picks Elijah Newren via GitGitGadget
2023-01-25 14:14 ` Phillip Wood
2023-01-25 4:03 ` [PATCH v5 06/10] rebase: add coverage of other incompatible options Elijah Newren via GitGitGadget
2023-01-25 4:03 ` [PATCH v5 07/10] rebase: clarify the OPT_CMDMODE incompatibilities Elijah Newren via GitGitGadget
2023-01-25 4:03 ` [PATCH v5 08/10] rebase: fix formatting of rebase --reapply-cherry-picks option in docs Elijah Newren via GitGitGadget
2023-01-25 4:03 ` [PATCH v5 09/10] rebase: put rebase_options initialization in single place Elijah Newren via GitGitGadget
2023-01-25 4:03 ` [PATCH v5 10/10] rebase: provide better error message for apply options vs. merge config Elijah Newren via GitGitGadget
2023-01-25 14:17 ` [PATCH v5 00/10] rebase: fix several code/testing/documentation issues around flag incompatibilities Phillip Wood
2023-01-25 16:39 ` Junio C Hamano
2023-01-25 16:48 ` Elijah Newren
2023-02-02 10:29 ` rebase --merge vs --whitespace=fix, was " Johannes Schindelin
2023-02-02 23:48 ` Elijah Newren
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=83c489c6-7927-ee3a-03bb-7896a928c280@dunelm.org.uk \
--to=phillip.wood123@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=martin.agren@gmail.com \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=sunshine@sunshineco.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 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).