Re: [PATCH 0/2] Fix behavior of worktree config in submodules

From: Glen Choo <chooglen@google.com>
Date: May 25, 2023, 19:56 UTC
Message-ID: <kl6lpm6oxk09.fsf@chooglen-macbookpro.roam.corp.google.com>
In-Reply-To: <pull.1536.git.1684883872.gitgitgadget@gmail.com>

"Victoria Dye via GitGitGadget" <gitgitgadget@gmail.com> writes:

> The outcome of this series is that 'extensions.worktreeConfig' and the
> contents of the repository's worktree config are read and applied to (and
> only to) the relevant repo when working in a super project/submodule setup.

Thanks sending these patches! This is an obvious bug, and squashing another global is always helpful.

> I'm
> also hoping this will help (or at least not hurt) the work to avoid use of
> global state in config parsing [2].

Both pieces of work touch different bits I think - yours plumbs and reads a "struct repository" before the config iterating begins, mine plumbs config source information after the config interating - so they don't help each other, but at least the conflicts are only textual.

Junio: There are quite a few conflicts. AFAICT each only has to be
resolved once (IOW the number of conflicts to be fixed is the same with
"git merge" vs "git rebase"). I have a v2 that I'm about to send, and if
you'd prefer (especially since you're on half-vacation), I can base it
off Victoria's topic, which looks pretty straightforward and will
probably get merged pretty quickly.