Re: What's cooking in git.git (Jan 2021, #02; Fri, 8)

On 1/15/2021 1:38 AM, Junio C Hamano wrote:

Junio C Hamano [off-list ref] writes:

quoted

Here is how eventual merge of the topic into 'master' would resolve
conflicts.  The straight merge chain from master..seen would have
such a merge with the resolution shown below, but 'next' already has
a mismerge, so I'll be applying a single-parent commit to fix the
mismerge directly on 'next' (which I'll send in a separate message).

And this is the 'next' mismerge fix.

----- >8 ----- >8 ----- >8 ----- >8 ----- >8 -----
Subject: [PATCH] Fix mismerge of ds/maintenance-part-4 topic

At 1f98c859 (Merge branch 'ds/maintenance-part-4' into next, 2021-01-08)
the ds/maintenance-part-4 topic, which had an incorrect invocation
of internal "git config" when $(pwd) had ERE special characters, was
merged into the mainline that added "--fixed-value" feature to the
"git config" command to address this exact issue, and also changed
how test-tool stubbed out crontab calls.

The semantic conflicts for the latter have been fully resolved at
that commit, but four places that "git config" was invoked to look
for entries with the same value as "$(pwd)" were not adjusted to use
the "--fixed-value".  They should have been.

Thanks for dealing with this fallout. Sorry for the mixup.

Helped-by: Emily Shaffer [off-list ref]

Would it be appropriate to convert this to a Co-authored-by?

Thanks,
-Stolee