git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Derrick Stolee <stolee@gmail.com>
Cc: Emily Shaffer <emilyshaffer@google.com>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jan 2021, #02; Fri, 8)
Date: Thu, 14 Jan 2021 22:38:52 -0800	[thread overview]
Message-ID: <xmqqmtxau2kj.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <xmqqr1mmu2nx.fsf@gitster.c.googlers.com> (Junio C. Hamano's message of "Thu, 14 Jan 2021 22:36:50 -0800")

Junio C Hamano <gitster@pobox.com> 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@google.com>
Helped-by: Taylor Blau <me@ttaylorr.com>
Helped-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 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


  reply	other threads:[~2021-01-15  6:40 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-08 19:22 What's cooking in git.git (Jan 2021, #02; Fri, 8) Junio C Hamano
2021-01-09 10:55 ` Ævar Arnfjörð Bjarmason
2021-01-09 21:28   ` Junio C Hamano
2021-01-09 22:05     ` brian m. carlson
2021-01-09 23:20       ` Junio C Hamano
2021-01-11  1:53         ` brian m. carlson
2021-01-11 19:04           ` Junio C Hamano
2021-01-12 14:00             ` Ævar Arnfjörð Bjarmason
2021-01-14 23:52               ` Emily Shaffer
2021-01-14 23:56                 ` Emily Shaffer
2021-01-15  7:22                   ` Junio C Hamano
2021-01-15  0:29                 ` brian m. carlson
2021-01-15  1:44                 ` Junio C Hamano
2021-01-16 16:23                 ` Ævar Arnfjörð Bjarmason
2021-01-17 17:15                   ` Jeff King
2021-01-17 20:22                     ` Ævar Arnfjörð Bjarmason
2021-01-10 19:00     ` Ævar Arnfjörð Bjarmason
2021-01-11  0:21       ` Junio C Hamano
2021-01-09 21:38 ` David Aguilar
2021-01-09 23:08   ` Junio C Hamano
2021-01-14 23:06 ` Emily Shaffer
2021-01-15  1:50   ` Junio C Hamano
2021-01-15  2:24     ` Taylor Blau
2021-01-15  2:44       ` Taylor Blau
2021-01-15  2:36   ` Derrick Stolee
2021-01-15  2:54     ` Derrick Stolee
2021-01-15  6:36     ` Junio C Hamano
2021-01-15  6:38       ` Junio C Hamano [this message]
2021-01-15 11:36         ` Derrick Stolee
2021-01-15 19:44           ` Junio C Hamano
2021-01-15 20:08             ` Emily Shaffer
2021-01-15 20:59               ` Junio C Hamano
2021-01-15 19:52 ` Jeff King
2021-01-15 21:40   ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqmtxau2kj.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=emilyshaffer@google.com \
    --cc=git@vger.kernel.org \
    --cc=stolee@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).