From: Derrick Stolee <stolee@gmail•com>
To: Emily Shaffer <emilyshaffer@google•com>,
Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org
Subject: Re: What's cooking in git.git (Jan 2021, #02; Fri, 8)
Date: Thu, 14 Jan 2021 21:36:44 -0500 [thread overview]
Message-ID: <15237c6c-98eb-0d1f-e6d5-2dda91c0ce09@gmail.com> (raw)
In-Reply-To: <YADOf41CcaRuToD7@google.com>
On 1/14/2021 6:06 PM, Emily Shaffer wrote:
> On Fri, Jan 08, 2021 at 11:22:23AM -0800, Junio C Hamano wrote:
>> * ds/maintenance-part-4 (2021-01-05) 4 commits
>> (merged to 'next' on 2021-01-08 at 1f98c859ea)
>> + maintenance: use Windows scheduled tasks
>> + maintenance: use launchctl on macOS
>> + maintenance: include 'cron' details in docs
>> + maintenance: extract platform-specific scheduling
>>
>> Follow-up on the "maintenance part-3" which introduced scheduled
>> maintenance tasks to support platforms whose native scheduling
>> methods are not 'cron'.
>>
>> Will merge to 'master'.
>
> This series again has troubles running inside a directory with regex
> metachars in the path. Courtesy of Jonathan Nieder, I think this fix
> matches the intent a little better; but if we don't like this, the same
> lines could be diffed just to add --fixed-value instead.
>
> Before this patch, the test said "Is there something configured in
> maintenance.repo that looks like $PWD?" and after this patch, the test
> says, "Does the config in maintenance.repo look like $PWD?" - so it is
> not quite semantically identical but I think may be clearer.
This appears to be a case of mixing up the order in which these
submissions came into place. js/t7900-protect-pwd-in-config-get added
--fixed-value, but that was simultaneous with ds/maintenance-part-4
which added more tests in this vein without including --fixed-value.
Looking at the history, ds/maintenance-part-4 doesn't have
js/t7900-protect-pwd-in-config-get in its history, which is probably
why you don't include --fixed-value in your patch.
Perhaps it would be better to have a --fixed-value patch on top
of the merge that combines the two topics?
> -- >8 --
> Subject: [PATCH] maintenace: explicitly test value of maintenance.repo
s/maintenace/maintenance/
> Make t7900-maintenance.sh easier to debug by printing and checking the
> value of maintenance.repo rather than using a search string. Since only
> one maintenance.repo is configured, this is fine; in the event that
> multiple maintenance.repo are configured during the test, instead the
> directory under test should be provided along with '--fixed-value'.
Here you mention --fixed-value as if you plan to use it. I'm all for
that plan.
> Signed-off-by: Emily Shaffer <emilyshaffer@google•com>
> ---
> t/t7900-maintenance.sh | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh
> index 2e0c8a4c31..0edad63227 100755
> --- a/t/t7900-maintenance.sh
> +++ b/t/t7900-maintenance.sh
> @@ -487,7 +487,9 @@ 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)" &&
> + pwd >expect &&
> + git config --get --global maintenance.repo >actual &&
> + test_cmp expect actual &&
Sorry again, but this (and others) would probably be better as
+ git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
Thanks,
-Stolee
next prev parent reply other threads:[~2021-01-15 2:37 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 [this message]
2021-01-15 2:54 ` Derrick Stolee
2021-01-15 6:36 ` Junio C Hamano
2021-01-15 6:38 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=15237c6c-98eb-0d1f-e6d5-2dda91c0ce09@gmail.com \
--to=stolee@gmail$(echo .)com \
--cc=emilyshaffer@google$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox