Re: [PATCH 00/12] Fix various overly aggressive protections in 2.45.1 and friends

From: Junio C Hamano <gitster@pobox.com>
Date: May 21, 2024, 21:46 UTC
Message-ID: <xmqqmsoi96tf.fsf@gitster.g>
In-Reply-To: <937e89c6-6161-42ba-670d-8f20ff90a7d0@gmx.de>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 11 quoted lines

> On Tue, 21 May 2024, Junio C Hamano wrote:
>
>> I'll figure out a way to convey conflict resolutions as this topic
>> gets merged up to newer maintenance tracks on the list so that
>> people can assist with ensuring correctness of the result by
>> reviewing, and follow up. ("git show --remerge-diff" might turn out
>> to be such a way, but I do not know yet).
>
> I pushed 12/12 to https://github.com/dscho/git's
> `various-fixes-for-v2.45.1-and-friends` branch, and updated the
> `tentative/maint-*` branches accordingly:

Thanks, but I suspect it is not productive use of your time to merge these up until we know we are happy with what we are merging up.

Even though I did the 12/12 that reverts the "iffy ownership check during repository discovery", it is far from clear without discussion if that is a reasonable thing to do or use of safe.directory by narrow non-target audience (like k.org that may use gitolite and/or bare git for hosting) that lets nobody access trusted user repositories. Every time we find new issues or different solutions, somebody has to merge it up, eventually to maint-2.45, but I am afraid it may be a bit too early to commit.

Show 9 quoted lines

>  + b9a96c4e5dc...c6da96aa5f0 maint-2.39 -> tentative/maint-2.39 (forced update)
>  + 4bf5d57da62...fff57b200d1 maint-2.40 -> tentative/maint-2.40 (forced update)
>  + 5215e4e3687...616450032a0 maint-2.41 -> tentative/maint-2.41 (forced update)
>  + 33efa2ad1a6...b1ea89bc2d6 maint-2.42 -> tentative/maint-2.42 (forced update)
>  + 0aeca2f80b1...093c42a6c6b maint-2.43 -> tentative/maint-2.43 (forced update)
>  + 9953011fcdd...3c7a7b923b3 maint-2.44 -> tentative/maint-2.44 (forced update)
>
> Ciao,
> Johannes