From: "SZEDER Gábor" <szeder.dev@gmail.com> To: git@vger.kernel.org Cc: "Derrick Stolee" <derrickstolee@github.com>, "Taylor Blau" <me@ttaylorr.com>, "Junio C Hamano" <gitster@pobox.com>, "SZEDER Gábor" <szeder.dev@gmail.com> Subject: [PATCH 1/3] t0033-safe-directory: check the error message without matching the trash dir Date: Wed, 27 Apr 2022 19:06:47 +0200 [thread overview] Message-ID: <20220427170649.4949-2-szeder.dev@gmail.com> (raw) In-Reply-To: <20220427170649.4949-1-szeder.dev@gmail.com> Since 8959555cee (setup_git_directory(): add an owner check for the top-level directory, 2022-03-02) when git finds itself in a repository owned by someone else, it aborts with a "fatal: unsafe repository (<repo path>)" error message and an advice about how to set the 'safe.directory' config variable to mark that repository as safe. 't0033-safe-directory.sh' contains tests that check that this feature and handling said config work as intended. To ensure that git dies for the right reason, several of those tests check that its standard error contains the name of that config variable, but: - it only appears in the advice part, not in the actual error message. - it is interpreted as a regexp by 'grep', so, because of the dot, it matches the name of the test script and the path of the trash directory as well. Consequently, these tests could be fooled by any error message that would happen to include the path of the test repository. Tighten these checks to look for "unsafe repository" instead. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> --- t/t0033-safe-directory.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t0033-safe-directory.sh b/t/t0033-safe-directory.sh index 239d93f4d2..6f9680e8b0 100755 --- a/t/t0033-safe-directory.sh +++ b/t/t0033-safe-directory.sh @@ -9,7 +9,7 @@ export GIT_TEST_ASSUME_DIFFERENT_OWNER expect_rejected_dir () { test_must_fail git status 2>err && - grep "safe.directory" err + grep "unsafe repository" err } test_expect_success 'safe.directory is not set' ' -- 2.36.0.676.gf39b21ed98
next prev parent reply other threads:[~2022-04-27 17:09 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 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 ` SZEDER Gábor [this message] 2022-05-09 22:27 ` [PATCH 1/3] t0033-safe-directory: check the error message without matching the trash dir 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=20220427170649.4949-2-szeder.dev@gmail.com \ --to=szeder.dev@gmail.com \ --cc=derrickstolee@github.com \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=me@ttaylorr.com \ --subject='Re: [PATCH 1/3] t0033-safe-directory: check the error message without matching the trash dir' \ /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
Code repositories for project(s) associated with this 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).