Re: [PATCH 5/9] pull: ensure --rebase overrides ability to ff

From: Elijah Newren <newren@gmail.com>
Date: Jul 21, 2021, 00:14 UTC
Message-ID: <CABPp-BE334GU9fuMOKRNK+f5jqv=r2P7gQ5tOhtVLe1gtmNCqw@mail.gmail.com>
In-Reply-To: <xmqqwnpkftjv.fsf@gitster.g>

On Tue, Jul 20, 2021 at 4:35 PM Junio C Hamano <gitster@pobox.com> wrote:

Show 13 quoted lines

>
> "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> > From: Elijah Newren <newren@gmail.com>
> >
> > Now that the handling of fast-forward-only in combination with rebases
> > has been moved before the merge-vs-rebase logic, we have an unnecessary
> > special fast-forward case left within the rebase logic.
>
> It is correct to say that we could call run_rebase() and it will do
> the right thing, even when can_ff is true, in this codepath.
>
> But I am not sure if you want to do this as a part of this series.

It turns out my commit message was wrong, and so was the patch. My changes did have a functional change, substituting one form of submodule breakage with another.

I'll replace this with a patch that fixes the submodule issue. (When --ff-only is specified, we should not rebase submodules. We should fast-forward both the parent module and the submodules.)