Junio C Hamano <gitster@xxxxxxxxx> writes: > 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. Helped-by: Emily Shaffer <emilyshaffer@xxxxxxxxxx> Helped-by: Taylor Blau <me@xxxxxxxxxxxx> Helped-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- t/t7900-maintenance.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index 2e0c8a4c31..1074009cc0 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -487,7 +487,7 @@ test_expect_success 'start and stop macOS maintenance' ' GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start && # start registers the repo - git config --get --global maintenance.repo "$(pwd)" && + git config --get --global --fixed-value maintenance.repo "$(pwd)" && ls "$HOME/Library/LaunchAgents" >actual && cat >expect <<-\EOF && @@ -512,7 +512,7 @@ test_expect_success 'start and stop macOS maintenance' ' GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance stop && # stop does not unregister the repo - git config --get --global maintenance.repo "$(pwd)" && + git config --get --global --fixed-value maintenance.repo "$(pwd)" && printf "bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \ hourly daily weekly >expect && @@ -538,7 +538,7 @@ test_expect_success 'start and stop Windows maintenance' ' GIT_TEST_MAINT_SCHEDULER="schtasks:./print-args" git maintenance start && # start registers the repo - git config --get --global maintenance.repo "$(pwd)" && + git config --get --global --fixed-value maintenance.repo "$(pwd)" && for frequency in hourly daily weekly do @@ -551,7 +551,7 @@ test_expect_success 'start and stop Windows maintenance' ' GIT_TEST_MAINT_SCHEDULER="schtasks:./print-args" git maintenance stop && # stop does not unregister the repo - git config --get --global maintenance.repo "$(pwd)" && + git config --get --global --fixed-value maintenance.repo "$(pwd)" && printf "/delete /tn Git Maintenance (%s) /f\n" \ hourly daily weekly >expect && -- 2.30.0-386-gfb533afdb4
