From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 17 Jul 2021 18:22:37 GMT
Subject: RE: [PATCH 4/9] pull: since --ff-only overrides, handle it first
Message-ID: <60f31fedbbd67_25f2208d@natae.notmuch>
In-Reply-To: <de4b460b09d3a3b6848f9f9eaa5520b31a3b453a.1626536508.git.gitgitgadget@gmail.com>

Elijah Newren via GitGitGadget wrote:
> From: Elijah Newren <newren@gmail.com>
> 
> There are both merge and rebase branches in the logic, and previously
> both had to handle fast-forwarding.  Merge handled that implicitly
> (because git merge handles it directly), while in rebase it was
> explicit.  Given that the --ff-only flag is meant to override any
> --rebase or --no-rebase, make the code reflect that by handling
> --ff-only before the merge-vs-rebase logic.
> 
> No functional changes, just making it easier to verify that the codeflow
> matches our precedence rules.

But it does have a functional changes. Now you are calling run_merge()
without update_submodules().

-- 
Felipe Contreras