From: Derrick Stolee <derrickstolee@github.com>
To: Junio C Hamano <gitster@pobox.com>,
Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, me@ttaylorr.com, johannes.schindelin@gmx.de
Subject: Re: [PATCH 1/3] t0033: add tests for safe.directory
Date: Wed, 13 Apr 2022 12:29:49 -0400 [thread overview]
Message-ID: <7f5bebcd-5622-51c7-2904-b793337843b1@github.com> (raw)
In-Reply-To: <xmqqwnft9cjg.fsf@gitster.g>
On 4/13/2022 12:24 PM, Junio C Hamano wrote:
> "Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
>> From: Derrick Stolee <derrickstolee@github.com>
>>
>> It is difficult to change the ownership on a directory in our test
>> suite, so insert a new GIT_TEST_ASSUME_DIFFERENT_OWNER environment
>> variable to trick Git into thinking we are in a differently-owned
>> directory. This allows us to test that the config is parsed correctly.
>
> OK.
>
>> - if (is_path_owned_by_current_user(path))
>> + if (is_path_owned_by_current_user(path) &&
>> + !git_env_bool("GIT_TEST_ASSUME_DIFFERENT_OWNER", 0))
>> return 1;
>
> Shouldn't the overriding "GIT_TEST_BLAH" be checked before the
> real logic kicks in, I wonder?
Either order would work. I bet that checking the environment is
faster than checking the disk, so swapping the order would be prudent
here.
>> diff --git a/t/t0033-safe-directory.sh b/t/t0033-safe-directory.sh
>> new file mode 100755
>> index 00000000000..9380ff3d017
>> --- /dev/null
>> +++ b/t/t0033-safe-directory.sh
>> @@ -0,0 +1,34 @@
>> +#!/bin/sh
>> +
>> +test_description='verify safe.directory checks'
>> +
>> +. ./test-lib.sh
>> +
>> +GIT_TEST_ASSUME_DIFFERENT_OWNER=1
>> +export GIT_TEST_ASSUME_DIFFERENT_OWNER
>> +
>> +expect_rejected_dir () {
>> + test_must_fail git status 2>err &&
>> + grep "safe.directory" err
>> +}
>> +...
>> +test_expect_success 'safe.directory matches' '
>> + git config --global --add safe.directory "$(pwd)" &&
>> + git status
>> +'
>
> Just double checking, as I know you are much closer to the affected
> platform than I'd ever be ;-) but is the use of $(pwd) safe and
> correct here?
>
> I always get confused between $(pwd) and $PWD, which does not make
> any difference on platforms I have access to, but makes difference
> to hurt Windows users.
These tests pass CI on Windows. I've had issues before using $PWD,
thinking back to tests in t7900-maintenance.sh that use $(pwd)
instead.
Thanks,
-Stolee
next prev parent reply other threads:[~2022-04-13 16:30 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-13 15:32 [PATCH 0/3] Updates to the safe.directory config option Derrick Stolee via GitGitGadget
2022-04-13 15:32 ` [PATCH 1/3] t0033: add tests for safe.directory Derrick Stolee via GitGitGadget
2022-04-13 16:24 ` Junio C Hamano
2022-04-13 16:29 ` Derrick Stolee [this message]
2022-04-13 19:16 ` Ævar Arnfjörð Bjarmason
2022-04-13 19:46 ` Junio C Hamano
2022-04-13 19:52 ` Derrick Stolee
2022-04-13 15:32 ` [PATCH 2/3] setup: fix safe.directory key not being checked Matheus Valadares via GitGitGadget
2022-04-13 16:34 ` Junio C Hamano
2022-04-13 15:32 ` [PATCH 3/3] setup: opt-out of check with safe.directory=* Derrick Stolee via GitGitGadget
2022-04-13 16:40 ` Junio C Hamano
2022-04-13 16:15 ` [PATCH 0/3] Updates to the safe.directory config option Junio C Hamano
2022-04-13 16:25 ` Derrick Stolee
2022-04-13 16:44 ` Junio C Hamano
2022-04-13 20:27 ` Junio C Hamano
2022-04-13 21:25 ` Taylor Blau
2022-04-13 21:45 ` Junio C Hamano
2022-04-27 17:06 ` [PATCH 0/3] t0033-safe-directory: test improvements and a documentation clarification SZEDER Gábor
2022-04-27 17:06 ` [PATCH 1/3] t0033-safe-directory: check the error message without matching the trash dir SZEDER Gábor
2022-05-09 22:27 ` Taylor Blau
2022-05-10 6:04 ` Carlo Marcelo Arenas Belón
2022-04-27 17:06 ` [PATCH 2/3] t0033-safe-directory: check when 'safe.directory' is ignored SZEDER Gábor
2022-04-27 20:37 ` Junio C Hamano
2022-04-29 16:12 ` Derrick Stolee
2022-04-29 17:57 ` Junio C Hamano
2022-04-29 19:06 ` SZEDER Gábor
2022-04-29 19:19 ` Derrick Stolee
2022-05-10 18:33 ` SZEDER Gábor
2022-05-10 19:55 ` Taylor Blau
2022-05-10 20:06 ` Carlo Marcelo Arenas Belón
2022-05-10 20:11 ` Taylor Blau
2022-05-10 20:18 ` Eric Sunshine
2022-04-27 17:06 ` [PATCH 3/3] safe.directory: document and check that it's ignored in the environment SZEDER Gábor
2022-04-27 20:42 ` Junio C Hamano
2022-04-27 20:49 ` Junio C Hamano
2022-04-29 16:13 ` Derrick Stolee
2022-05-09 21:39 ` SZEDER Gábor
2022-05-09 21:45 ` Junio C Hamano
2022-05-10 18:48 ` SZEDER Gábor
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=7f5bebcd-5622-51c7-2904-b793337843b1@github.com \
--to=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=me@ttaylorr.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).