From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Emily Shaffer" <emilyshaffer@google.com>,
"Albert Cui" <albertcui@google.com>,
"Phillip Wood" <phillip.wood123@gmail.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Matheus Tavares Bernardino" <matheus.bernardino@usp.br>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Jacob Keller" <jacob.keller@gmail.com>,
"Atharva Raykar" <raykar.ath@gmail.com>,
"Derrick Stolee" <stolee@gmail.com>,
"Jonathan Tan" <jonathantanmy@google.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [RFC PATCH 1/2] submodule tests: fix potentially broken "config .. --unset"
Date: Wed, 17 Nov 2021 12:43:39 +0100 [thread overview]
Message-ID: <RFC-patch-1.2-a8e31e35392-20211117T113134Z-avarab@gmail.com> (raw)
In-Reply-To: <RFC-cover-0.2-00000000000-20211117T113134Z-avarab@gmail.com>
These "config ... --unset" at the start must be guarded by something
like a test_might_fail, or we'll fail if a previous test didn't run,
e.g. due to the --run option.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
t/t7406-submodule-update.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index b42a339982b..01e1acaf300 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -1063,7 +1063,7 @@ test_expect_success 'submodule update --quiet passes quietness to fetch with a s
test_expect_success 'submodule update adds superproject gitdir to older repos' '
(cd super &&
- git -C submodule config --unset submodule.superprojectGitdir &&
+ test_might_fail git -C submodule config --unset submodule.superprojectGitdir &&
git submodule update &&
test-tool path-utils relative_path \
"$(git rev-parse --absolute-git-dir)" \
@@ -1075,7 +1075,7 @@ test_expect_success 'submodule update adds superproject gitdir to older repos' '
test_expect_success 'submodule update uses config.worktree if applicable' '
(cd super &&
- git -C submodule config --unset submodule.superprojectGitDir &&
+ test_might_fail git -C submodule config --unset submodule.superprojectGitDir &&
git -C submodule config extensions.worktreeConfig true &&
git submodule update &&
test-tool path-utils relative_path \
--
2.34.0.796.g2c87ed6146a
next prev parent reply other threads:[~2021-11-17 11:43 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-17 0:56 [PATCH v6 0/5] teach submodules to know they're submodules Emily Shaffer
2021-11-17 0:56 ` [PATCH v6 1/5] t7400-submodule-basic: modernize inspect() helper Emily Shaffer
2021-11-17 0:56 ` [PATCH v6 2/5] introduce submodule.superprojectGitDir record Emily Shaffer
2021-11-17 23:43 ` Jonathan Tan
2021-11-17 0:56 ` [PATCH v6 3/5] submodule: record superproject gitdir during absorbgitdirs Emily Shaffer
2021-11-17 0:57 ` [PATCH v6 4/5] submodule: record superproject gitdir during 'update' Emily Shaffer
2021-11-17 0:57 ` [PATCH v6 5/5] submodule: use config to find superproject worktree Emily Shaffer
2021-11-17 11:43 ` [RFC PATCH 0/2] submodule: test what happens if submodule.superprojectGitDir isn't around Ævar Arnfjörð Bjarmason
2021-11-17 11:43 ` Ævar Arnfjörð Bjarmason [this message]
2021-11-17 11:43 ` [RFC PATCH 2/2] submodule: add test mode for checking absence of "superProjectGitDir" Ævar Arnfjörð Bjarmason
2021-11-23 20:08 ` [RFC PATCH 0/2] submodule: test what happens if submodule.superprojectGitDir isn't around Emily Shaffer
2021-11-24 1:38 ` Ævar Arnfjörð Bjarmason
2021-11-17 23:28 ` [PATCH v6 0/5] teach submodules to know they're submodules Jonathan Tan
2021-11-23 20:28 ` Emily Shaffer
2022-02-03 21:59 ` Emily Shaffer
2022-02-03 21:59 ` [PATCH v7 1/4] t7400-submodule-basic: modernize inspect() helper Emily Shaffer
2022-02-03 21:59 ` [PATCH v7 2/4] introduce submodule.superprojectGitDir record Emily Shaffer
2022-02-03 21:59 ` [PATCH v7 3/4] submodule: record superproject gitdir during absorbgitdirs Emily Shaffer
2022-02-03 21:59 ` [PATCH v7 4/4] submodule: record superproject gitdir during 'update' Emily Shaffer
2022-02-03 22:39 ` [PATCH v6 0/5] teach submodules to know they're submodules Junio C Hamano
2022-02-04 1:15 ` Ævar Arnfjörð Bjarmason
2022-02-04 16:20 ` Junio C Hamano
2022-02-07 19:56 ` Jonathan Nieder
2022-02-07 23:21 ` Junio C Hamano
2022-02-08 1:18 ` Jonathan Nieder
2022-02-08 18:24 ` Junio C Hamano
2022-02-10 22:12 ` Emily Shaffer
2022-02-10 22:53 ` Jonathan Nieder
2022-02-12 20:35 ` Ævar Arnfjörð Bjarmason
2022-02-13 6:25 ` Junio C Hamano
2022-03-01 0:26 ` [PATCH v8 0/3] " Emily Shaffer
2022-03-01 0:26 ` [PATCH v8 1/3] t7400-submodule-basic: modernize inspect() helper Emily Shaffer
2022-03-01 0:26 ` [PATCH v8 2/3] introduce submodule.hasSuperproject record Emily Shaffer
2022-03-01 7:00 ` Junio C Hamano
2022-03-08 20:04 ` Emily Shaffer
2022-03-08 22:13 ` Glen Choo
2022-03-08 22:29 ` Glen Choo
2022-03-01 0:26 ` [PATCH v8 3/3] rev-parse: short-circuit superproject worktree when config unset Emily Shaffer
2022-03-01 7:06 ` Junio C Hamano
2022-03-09 0:38 ` Emily Shaffer
2022-03-01 3:08 ` [PATCH v8 0/3] teach submodules to know they're submodules Junio C Hamano
2022-03-08 18:54 ` Emily Shaffer
2022-03-10 0:44 ` [PATCH v9 " Emily Shaffer
2022-03-10 0:44 ` [PATCH v9 1/3] t7400-submodule-basic: modernize inspect() helper Emily Shaffer
2022-03-10 0:44 ` [PATCH v9 2/3] introduce submodule.hasSuperproject record Emily Shaffer
2022-03-10 2:09 ` Junio C Hamano
2022-03-10 21:29 ` Glen Choo
2022-03-10 21:40 ` Glen Choo
2022-03-10 22:10 ` Junio C Hamano
2022-03-10 23:42 ` Glen Choo
2022-03-10 23:53 ` Glen Choo
2022-03-15 20:48 ` Emily Shaffer
2022-03-15 20:56 ` Emily Shaffer
2022-03-15 21:19 ` Glen Choo
2022-03-15 18:39 ` Emily Shaffer
2022-03-15 19:19 ` Junio C Hamano
2022-03-10 2:32 ` Junio C Hamano
2022-03-10 21:54 ` Glen Choo
2022-03-15 18:27 ` Emily Shaffer
2022-03-10 0:44 ` [PATCH v9 3/3] rev-parse: short-circuit superproject worktree when config unset Emily Shaffer
2022-03-10 1:47 ` Junio C Hamano
2022-03-10 4:39 ` Eric Sunshine
2022-03-11 9:09 ` [PATCH v9 0/3] teach submodules to know they're submodules Ævar Arnfjörð Bjarmason
2022-03-13 5:43 ` 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=RFC-patch-1.2-a8e31e35392-20211117T113134Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=albertcui@google.com \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=jonathantanmy@google.com \
--cc=jrnieder@gmail.com \
--cc=matheus.bernardino@usp.br \
--cc=phillip.wood123@gmail.com \
--cc=raykar.ath@gmail.com \
--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).