On Tue, Jul 20, 2021 at 4:35 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > "Elijah Newren via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > > > From: Elijah Newren <newren@xxxxxxxxx> > > > > 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.)
