From: Glen Choo <chooglen@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Emily Shaffer <emilyshaffer@google.com>, git@vger.kernel.org
Subject: Re: [PATCH v9 2/3] introduce submodule.hasSuperproject record
Date: Thu, 10 Mar 2022 15:53:17 -0800 [thread overview]
Message-ID: <kl6l1qz9s6tu.fsf@chooglen-macbookpro.roam.corp.google.com> (raw)
In-Reply-To: <kl6l4k45s7cb.fsf@chooglen-macbookpro.roam.corp.google.com>
Glen Choo <chooglen@google.com> writes:
> Junio C Hamano <gitster@pobox.com> writes:
>
>>> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
>>> index bef9ab22d4..f53808d995 100644
>>> --- a/builtin/submodule--helper.c
>>> +++ b/builtin/submodule--helper.c
>>> @@ -2672,6 +2677,11 @@ static int run_update_procedure(int argc, const char **argv, const char *prefix)
>>> &update_data.update_strategy);
>>>
>>> free(prefixed_path);
>>> + /*
>>> + * This entry point is always called from a submodule, so this is a
>>> + * good place to set a hint that this repo is a submodule.
>>> + */
>>> + git_config_set("submodule.hasSuperproject", "true");
>>> return update_submodule2(&update_data);
>>> }
>>
>> That matched my tentative resolution I made last night, but what do
>> you think about this part of the test added by the patch?
>>
>> diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
>> index 11cccbb333..ec2397fc69 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 &&
>> + test_unconfig submodule.hasSuperproject &&
>> + git submodule update &&
>> + test_cmp_config -C submodule true --type=bool submodule.hasSuperproject
>> + )
>> +'
>> +
>> test_done
>>
>> We go to "super", make sure that superproject does not have
>> submodule.hasSuperproject set, run "git submodule update", and see
>> if the configuration file in "submodule" subdirectory has the
>> variable set. It does not clear the variable from the submodule
>> before starting, so the variable given to the submodule when it was
>> cloned would be there, even if "git submodule update" failed to set
>> it.
>>
>> I am wondering if it should do something like the attached instead.
>>
>> We
>>
>> * clear the variable from "super" and "super/submodule"
>> repositories;
>>
>> * run "git submodule update";
>>
>> * ensure that "git submodule update" did not touch "super/.git/config";
>>
>> * ensure that "git submodule update" added the variable to
>> "super/submodule/.git/config".
>>
>> Clearing the variable from "super" is technically wrong because the
>> repository is set up as a submodule of "recursivesuper" and if we
>> had further tests, we should restore it in "super", but the point is
>> that we are makng sure "git submodule update" sets the variable in
>> the configuration file of the submodule, and not in the superproject's.
>
> Yes, the test you've described is closer to what I thought the original
> test was trying to do. Seeing this test pass gave me a false sense of
> confidence hm..
Correction, seeing the _original_ test pass gave me false sense of
confidence.
>> With the conflict resolution above, this "corrected" test fails and
>> shows that superproject's configuration file is updated after "git
>> submodule update".
>>
>> This series alone, without your topic, this "corrected" test fails,
>> and that is where my "are we sure we are mucking with the
>> configuration file in the submodule"? comes from.
> - Set the config in the submodule even though we are running from the
> superproject (this is possible, ensure_core_worktree() does this).
If it helps, I was able to do this up by copying
ensure_core_worktree(), and this passes the amended test.
----- >8 --------- >8 --------- >8 --------- >8 --------- >8 ----
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 4d02dd05ca..3bb7a65762 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -1838,11 +1838,6 @@ static int clone_submodule(struct module_clone_data *clone_data)
git_config_set_in_file(p, "submodule.alternateErrorStrategy",
error_strategy);
- /*
- * Teach the submodule that it's a submodule.
- */
- git_config_set_in_file(p, "submodule.hasSuperproject", "true");
-
free(sm_alternate);
free(error_strategy);
@@ -2560,6 +2555,20 @@ static int update_clone(int argc, const char **argv, const char *prefix)
return update_submodules(&suc);
}
+static void set_hassuperproject(const char *sm_path)
+{
+ struct repository subrepo;
+ char *cfg_file;
+
+ if (repo_submodule_init(&subrepo, the_repository, sm_path, null_oid()))
+ die(_("could not get a repository handle for submodule '%s'"), sm_path);
+
+ cfg_file = repo_git_path(&subrepo, "config");
+ git_config_set_in_file(cfg_file, "submodule.hasSuperproject", "true");
+
+ free(cfg_file);
+}
+
static int run_update_procedure(int argc, const char **argv, const char *prefix)
{
int force = 0, quiet = 0, nofetch = 0, just_cloned = 0;
@@ -2622,10 +2631,9 @@ static int run_update_procedure(int argc, const char **argv, const char *prefix)
free(prefixed_path);
/*
- * This entry point is always called from a submodule, so this is a
- * good place to set a hint that this repo is a submodule.
+ * Teach the submodule that it's a submodule.
*/
- git_config_set("submodule.hasSuperproject", "true");
+ set_hassuperproject(update_data.sm_path);
if (!oideq(&update_data.oid, &update_data.suboid) || update_data.force)
return do_run_update_procedure(&update_data);
next prev parent reply other threads:[~2022-03-10 23:54 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
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 [this message]
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=kl6l1qz9s6tu.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).