Re: [PATCH v2 0/3] More add_submodule_odb() cleanup in merge code

From: Elijah Newren <newren@gmail.com>
Date: Sep 14, 2021, 01:31 UTC
Message-ID: <CABPp-BFrDgh02gOmX9SPrF8nXkQ8uyBkvt-cKyLUGtrfsx4HKg@mail.gmail.com>
In-Reply-To: <cover.1631212893.git.jonathantanmy@google.com>

On Thu, Sep 9, 2021 at 11:50 AM Jonathan Tan <jonathantanmy@google.com> wrote:

Show 15 quoted lines

>
> This is on jt/grep-wo-submodule-odb-as-alternate (unlike version 1)
> because that branch introduces another usage of repo_submodule_init(),
> and I need to update it.
>
> The main change from version 1 is that I have introduced a patch (patch
> 2) that teaches repo_submodule_init() to support submodules with
> unabsorbed gitdirs, which means that I no longer need the original patch
> 1 that updated t6437 to absorb all git dirs.
>
> Once again, all these patches work under
> GIT_TEST_MERGE_ALGORITHM=recursive and GIT_TEST_MERGE_ALGORITHM=ort (and
> when that envvar is unset, for good measure).
>
> I have also tested it with the "DO NOT SUBMIT" patch 3 from version 1.

While I don't yet know the details of repositories and submodules, I know the merge-recursive and merge-ort side of things and those changes all look reasonable to me. So here's an Ack for that side of patch 3.

Despite not being familiar with the repository and submodule storage parts of the code, I took a look over the remainder of the 3 patches to look for anything that might stand out and look amiss. I didn't spot anything; it all looks reasonable to me.