Re: [PATCH v3 00/12] config: remove global state from config iteration

From: Glen Choo <chooglen@google.com>
Date: Jun 21, 2023, 23:06 UTC
Message-ID: <kl6lh6r0qut8.fsf@chooglen-macbookpro.roam.corp.google.com>
In-Reply-To: <xmqqr0q4fpzb.fsf@gitster.g>

Junio C Hamano <gitster@pobox.com> writes:

Show 7 quoted lines

> I've reviewed them in its current shape, but it seems to cause too
> many conflicts even when merged to 'next', let alone 'seen', with
> interactions with topics in flight:
>
>  * ds/add-i-color-configuration-fix (easy)
>  * ps/fetch-cleanups (easy but messy)
>  * vd/worktree-config-is-per-repository (moderately messy)

Ah, sorry. I ran some trial merges against these before I sent out v3, but I forgot as I sent this out. Not queueing this version sounds fine.

> some of which may have graduated to 'master' in the meantime, so it
> might not be a bad idea to rebase on a more recent 'master' after
> you collect and adjust for review comments on v3.

Sounds good. I suppose it would also be worthwhile to base it on conflicting topics queued for 'next'.