git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Elijah Newren <newren@gmail.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: Git Mailing List <git@vger.kernel.org>,
	Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 0/3] More add_submodule_odb() cleanup in merge code
Date: Mon, 13 Sep 2021 18:31:04 -0700	[thread overview]
Message-ID: <CABPp-BFrDgh02gOmX9SPrF8nXkQ8uyBkvt-cKyLUGtrfsx4HKg@mail.gmail.com> (raw)
In-Reply-To: <cover.1631212893.git.jonathantanmy@google.com>

On Thu, Sep 9, 2021 at 11:50 AM Jonathan Tan <jonathantanmy@google.com> wrote:
>
> 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.

      parent reply	other threads:[~2021-09-14  1:31 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-08 18:18 [PATCH 0/3] More add_submodule_odb() cleanup in merge code Jonathan Tan
2021-09-08 18:18 ` [PATCH 1/3] t6437: run absorbgitdirs on repos Jonathan Tan
2021-09-08 22:02   ` Jonathan Tan
2021-09-08 22:20   ` Junio C Hamano
2021-09-09 17:47     ` Jonathan Tan
2021-09-08 18:18 ` [PATCH 2/3] revision: remove "submodule" from opt struct Jonathan Tan
2021-09-08 18:18 ` [PATCH 3/3] DO NOT SUBMIT commit-reach,revision: verify non-mixing Jonathan Tan
2021-09-09 15:26 ` [PATCH 0/3] More add_submodule_odb() cleanup in merge code Elijah Newren
2021-09-09 17:51   ` Jonathan Tan
2021-09-09 18:47 ` [PATCH v2 " Jonathan Tan
2021-09-09 18:47   ` [PATCH v2 1/3] submodule: remove unnecessary unabsorbed fallback Jonathan Tan
2021-09-09 18:47   ` [PATCH v2 2/3] repository: support unabsorbed in repo_submodule_init Jonathan Tan
2021-09-09 18:47   ` [PATCH v2 3/3] revision: remove "submodule" from opt struct Jonathan Tan
2021-09-14  1:31   ` Elijah Newren [this message]

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CABPp-BFrDgh02gOmX9SPrF8nXkQ8uyBkvt-cKyLUGtrfsx4HKg@mail.gmail.com \
    --to=newren@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jonathantanmy@google.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).