From: Glen Choo <chooglen@google.com>
To: Emily Shaffer <emilyshaffer@google.com>, git@vger.kernel.org
Cc: Emily Shaffer <emilyshaffer@google.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v8 2/3] introduce submodule.hasSuperproject record
Date: Tue, 08 Mar 2022 14:13:34 -0800 [thread overview]
Message-ID: <kl6lee3c5bzl.fsf@chooglen-macbookpro.roam.corp.google.com> (raw)
In-Reply-To: <20220301002613.1459916-3-emilyshaffer@google.com>
Reviewing this series lightly because I will need to base
'ar/submodule-update reroll pt 2' on this (pt.1 is at
https://lore.kernel.org/git/20220305001401.20888-1-chooglen@google.com).
Emily Shaffer <emilyshaffer@google.com> writes:
> diff --git a/git-submodule.sh b/git-submodule.sh
> index 652861aa66..59dffda775 100755
> --- a/git-submodule.sh
> +++ b/git-submodule.sh
> @@ -449,6 +449,9 @@ cmd_update()
> ;;
> esac
>
> + # Note that the submodule is a submodule.
> + git -C "$sm_path" config submodule.hasSuperproject "true"
> +
> if test -n "$recursive"
> then
> (
This hunk has a textual conflict with 'ar/submodule-update reroll pt
2', but the fix is easy - just teach "git submodule--helper update" to
set the config in C.
> diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
> index 11cccbb333..422c3cc343 100755
> --- a/t/t7406-submodule-update.sh
> +++ b/t/t7406-submodule-update.sh
> @@ -1061,4 +1061,12 @@ test_expect_success 'submodule update --quiet passes quietness to fetch with a s
> )
> '
>
> +test_expect_success 'submodule update adds submodule.hasSuperproject to older repos' '
> + (cd super &&
> + git -C submodule config --unset submodule.hasSuperproject &&
> + git submodule update &&
> + git -C submodule config submodule.hasSuperproject
> + )
> +'
> +
> test_done
I think there is a gap in the test coverage. I notice that this doesn't
test that we set submodule.hasSuperproject when the submodule is cloned
for the first time with 'git submodule update'. I thought that maybe the
test for this was here...
> diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
> index 40cf8d89aa..833fa01961 100755
> --- a/t/t7400-submodule-basic.sh
> +++ b/t/t7400-submodule-basic.sh
> @@ -115,6 +115,10 @@ inspect() {
> git -C "$sub_dir" rev-parse HEAD >head-sha1 &&
> git -C "$sub_dir" update-index --refresh &&
> git -C "$sub_dir" diff-files --exit-code &&
> +
> + # Ensure that submodule.hasSuperproject is set.
> + git -C "$sub_dir" config "submodule.hasSuperproject"
> +
> git -C "$sub_dir" clean -n -d -x >untracked
> }
>
But when I removed the "set submodule.hasSuperproject in submodule"
line, i.e.
git -C "$sm_path" config submodule.hasSuperproject "true"
t7400 still passes.
next prev parent reply other threads:[~2022-03-08 22:14 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 ` [RFC PATCH 1/2] submodule tests: fix potentially broken "config .. --unset" Ævar Arnfjörð Bjarmason
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 [this message]
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=kl6lee3c5bzl.fsf@chooglen-macbookpro.roam.corp.google.com \
--to=chooglen@google.com \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).