From: Derrick Stolee <stolee@gmail.com>
To: Emily Shaffer <emilyshaffer@google.com>, git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v3 2/4] introduce submodule.superprojectGitDir record
Date: Thu, 19 Aug 2021 20:38:19 -0400 [thread overview]
Message-ID: <9fecf160-9646-7e56-478c-aa5f8defa6a9@gmail.com> (raw)
In-Reply-To: <20210819200953.2105230-3-emilyshaffer@google.com>
On 8/19/2021 4:09 PM, Emily Shaffer wrote:
...
> +submodule.superprojectGitDir::
> + The relative path from the submodule's worktree to its superproject's
> + gitdir. When Git is run in a repository, it usually makes no difference
> + whether this repository is standalone or a submodule, but if this
> + configuration variable is present, additional behavior may be possible,
> + such as "git status" printing additional information about this
> + submodule's status with respect to its superproject. This config should
> + only be present in projects which are submodules, but is not guaranteed
> + to be present in every submodule, so only optional value-added behavior
> + should be linked to it. It is set automatically during
> + submodule creation.
> ++
> + Because of this configuration variable, it is forbidden to use the
> + same submodule worktree shared by multiple superprojects.
nit: this paragraph linked with the "+" line should have no tabbing.
Also, could we use the same submodule worktree for multiple superprojects
_before_ this configuration variable? That seems wild to me. Or, is that
not a new requirement?
Perhaps you mean something like this instead:
It is forbidden to use the same submodule worktree for multiple
superprojects, so this configuration variable stores the unique
superproject and is not multi-valued.
> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
> index d55f6262e9..d60fcd2c7d 100644
> --- a/builtin/submodule--helper.c
> +++ b/builtin/submodule--helper.c
> @@ -1910,6 +1910,10 @@ static int module_clone(int argc, const char **argv, const char *prefix)
> git_config_set_in_file(p, "submodule.alternateErrorStrategy",
> error_strategy);
>
> + git_config_set_in_file(p, "submodule.superprojectGitdir",
> + relative_path(absolute_path(get_git_dir()),
> + path, &sb));
> +
I see that all new submodules will have this configuration set. But we will
also live in a world where some existing submodules do not have this variable
set. I'll look elsewhere for compatibility checks.
> inspect() {
> - dir=$1 &&
> -
> - git -C "$dir" for-each-ref --format='%(refname)' 'refs/heads/*' >heads &&
> - { git -C "$dir" symbolic-ref HEAD || :; } >head &&
> - git -C "$dir" rev-parse HEAD >head-sha1 &&
> - git -C "$dir" update-index --refresh &&
> - git -C "$dir" diff-files --exit-code &&
> - git -C "$dir" clean -n -d -x >untracked
> + sub_dir=$1 &&
> + super_dir=$2 &&
> +
> + git -C "$sub_dir" for-each-ref --format='%(refname)' 'refs/heads/*' >heads &&
> + { git -C "$sub_dir" symbolic-ref HEAD || :; } >head &&
> + git -C "$sub_dir" rev-parse HEAD >head-sha1 &&
> + git -C "$sub_dir" update-index --refresh &&
> + git -C "$sub_dir" diff-files --exit-code &&
> + cached_super_dir="$(git -C "$sub_dir" config --get submodule.superprojectGitDir)" &&
> + [ "$(git -C "$super_dir" rev-parse --absolute-git-dir)" \
> + -ef "$sub_dir/$cached_super_dir" ] &&
> + git -C "$sub_dir" clean -n -d -x >untracked
You rewrote this test in the previous patch, and now every line is changed
because you renamed 'dir' to 'sub_dir'. Could the previous patch use
'sub_dir' from the start so this change only shows the new lines instead of
many edited lines?
> }
>
> test_expect_success 'submodule add' '
> @@ -138,7 +142,7 @@ test_expect_success 'submodule add' '
> ) &&
>
> rm -f heads head untracked &&
> - inspect addtest/submod &&
> + inspect addtest/submod addtest &&
Similarly, I would not be upset to see these lines be changed just the
once, even if the second argument is ignored for a single commit. But
this nitpick is definitely less important since I could see taste
swaying things either way.
Thanks,
-Stolee
next prev parent reply other threads:[~2021-08-20 0:38 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-11 22:54 [RFC PATCH 0/4] cache parent project's gitdir in submodules Emily Shaffer
2021-06-11 22:54 ` [RFC PATCH 1/4] t7400-submodule-basic: modernize inspect() helper Emily Shaffer
2021-06-14 4:52 ` Junio C Hamano
2021-06-11 22:54 ` [RFC PATCH 2/4] introduce submodule.superprojectGitDir cache Emily Shaffer
2021-06-14 5:09 ` Junio C Hamano
2021-06-15 22:00 ` Emily Shaffer
2021-06-11 22:54 ` [RFC PATCH 3/4] submodule: cache superproject gitdir during absorbgitdirs Emily Shaffer
2021-06-14 6:18 ` Junio C Hamano
2021-06-11 22:54 ` [RFC PATCH 4/4] submodule: cache superproject gitdir during 'update' Emily Shaffer
2021-06-14 6:22 ` Junio C Hamano
2021-06-15 21:27 ` Emily Shaffer
2021-06-12 20:12 ` [RFC PATCH 0/4] cache parent project's gitdir in submodules Jacob Keller
2021-06-14 7:26 ` Junio C Hamano
2021-06-15 21:18 ` Emily Shaffer
2021-06-16 0:45 ` [PATCH v2 " Emily Shaffer
2021-06-16 0:45 ` [PATCH v2 1/4] t7400-submodule-basic: modernize inspect() helper Emily Shaffer
2021-07-27 17:12 ` Jonathan Tan
2021-08-19 17:46 ` Emily Shaffer
2021-06-16 0:45 ` [PATCH v2 2/4] introduce submodule.superprojectGitDir cache Emily Shaffer
2021-06-16 4:40 ` Junio C Hamano
2021-06-16 4:43 ` Junio C Hamano
2021-06-18 0:03 ` Emily Shaffer
2021-06-18 0:00 ` Emily Shaffer
2021-07-27 17:46 ` Jonathan Tan
2021-08-19 17:53 ` Emily Shaffer
2021-10-14 19:25 ` Ævar Arnfjörð Bjarmason
2021-06-16 0:45 ` [PATCH v2 3/4] submodule: cache superproject gitdir during absorbgitdirs Emily Shaffer
2021-06-16 0:45 ` [PATCH v2 4/4] submodule: cache superproject gitdir during 'update' Emily Shaffer
2021-07-27 17:51 ` Jonathan Tan
2021-08-19 18:02 ` Emily Shaffer
2021-08-19 20:09 ` [PATCH v3 0/4] cache parent project's gitdir in submodules Emily Shaffer
2021-08-19 20:09 ` [PATCH v3 1/4] t7400-submodule-basic: modernize inspect() helper Emily Shaffer
2021-08-19 20:09 ` [PATCH v3 2/4] introduce submodule.superprojectGitDir record Emily Shaffer
2021-08-20 0:38 ` Derrick Stolee [this message]
2021-10-13 19:36 ` Emily Shaffer
2021-09-04 17:20 ` Matheus Tavares
2021-10-13 19:39 ` Emily Shaffer
2021-08-19 20:09 ` [PATCH v3 3/4] submodule: record superproject gitdir during absorbgitdirs Emily Shaffer
2021-08-20 0:50 ` Derrick Stolee
2021-10-13 19:42 ` Emily Shaffer
2021-09-04 17:27 ` Matheus Tavares
2021-10-14 18:40 ` Emily Shaffer
2021-08-19 20:09 ` [PATCH v3 4/4] submodule: record superproject gitdir during 'update' Emily Shaffer
2021-08-20 0:59 ` Derrick Stolee
2021-10-14 18:45 ` Emily Shaffer
2021-08-19 21:56 ` [PATCH v3 0/4] cache parent project's gitdir in submodules Junio C Hamano
2021-08-20 1:09 ` Derrick Stolee
2021-10-13 18:51 ` Emily Shaffer
2021-10-14 17:12 ` Derrick Stolee
2021-10-14 18:52 ` Emily Shaffer
2021-09-04 17:50 ` Matheus Tavares Bernardino
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=9fecf160-9646-7e56-478c-aa5f8defa6a9@gmail.com \
--to=stolee@gmail.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).