From: Emily Shaffer <emilyshaffer@google.com>
To: git@vger.kernel.org
Cc: Emily Shaffer <emilyshaffer@google.com>
Subject: [PATCH v6 3/5] submodule: record superproject gitdir during absorbgitdirs
Date: Tue, 16 Nov 2021 16:56:59 -0800 [thread overview]
Message-ID: <20211117005701.371808-4-emilyshaffer@google.com> (raw)
In-Reply-To: <20211117005701.371808-1-emilyshaffer@google.com>
Already during 'git submodule add' we record a pointer to the
superproject's gitdir. However, this doesn't help brand-new
submodules created with 'git init' and later absorbed with 'git
submodule absorbgitdirs'. Let's start adding that pointer during 'git
submodule absorbgitdirs' too.
Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
---
submodule.c | 23 +++++++++
t/t7412-submodule-absorbgitdirs.sh | 82 +++++++++++++++++++++++++++++-
2 files changed, 103 insertions(+), 2 deletions(-)
diff --git a/submodule.c b/submodule.c
index c689070524..d7395c7551 100644
--- a/submodule.c
+++ b/submodule.c
@@ -2097,6 +2097,9 @@ static void relocate_single_git_dir_into_superproject(const char *path)
char *old_git_dir = NULL, *real_old_git_dir = NULL, *real_new_git_dir = NULL;
struct strbuf new_gitdir = STRBUF_INIT;
const struct submodule *sub;
+ struct config_set sub_cs;
+ struct strbuf config_path = STRBUF_INIT, sb = STRBUF_INIT;
+ int tmp;
if (submodule_uses_worktrees(path))
die(_("relocate_gitdir for submodule '%s' with "
@@ -2127,6 +2130,26 @@ static void relocate_single_git_dir_into_superproject(const char *path)
relocate_gitdir(path, real_old_git_dir, real_new_git_dir);
+ /*
+ * Note location of superproject's gitdir. Because the submodule already
+ * has a gitdir and local config, we can store this pointer from
+ * worktree config to worktree config, if the submodule has
+ * extensions.worktreeConfig set.
+ */
+ strbuf_addf(&config_path, "%s/config", real_new_git_dir);
+ git_configset_init(&sub_cs);
+ git_configset_add_file(&sub_cs, config_path.buf);
+ /* return 0 indicates config was found - we have a worktree config */
+ if (!git_configset_get_bool(&sub_cs, "extensions.worktreeConfig", &tmp))
+ strbuf_addstr(&config_path, ".worktree");
+
+ git_config_set_in_file(config_path.buf, "submodule.superprojectGitdir",
+ relative_path(absolute_path(get_git_dir()),
+ real_new_git_dir, &sb));
+
+ git_configset_clear(&sub_cs);
+ strbuf_release(&config_path);
+ strbuf_release(&sb);
free(old_git_dir);
free(real_old_git_dir);
free(real_new_git_dir);
diff --git a/t/t7412-submodule-absorbgitdirs.sh b/t/t7412-submodule-absorbgitdirs.sh
index 1cfa150768..5753f90268 100755
--- a/t/t7412-submodule-absorbgitdirs.sh
+++ b/t/t7412-submodule-absorbgitdirs.sh
@@ -30,7 +30,17 @@ test_expect_success 'absorb the git dir' '
git status >actual.1 &&
git -C sub1 rev-parse HEAD >actual.2 &&
test_cmp expect.1 actual.1 &&
- test_cmp expect.2 actual.2
+ test_cmp expect.2 actual.2 &&
+
+ # make sure the submodule cached the superproject gitdir correctly
+ submodule_gitdir="$(git -C sub1 rev-parse --path-format=absolute --git-common-dir)" &&
+ superproject_gitdir="$(git rev-parse --path-format=absolute --git-common-dir)" &&
+
+ test-tool path-utils relative_path "$superproject_gitdir" \
+ "$submodule_gitdir" >expect &&
+ git -C sub1 config submodule.superprojectGitDir >actual &&
+
+ test_cmp expect actual
'
test_expect_success 'absorbing does not fail for deinitialized submodules' '
@@ -61,7 +71,16 @@ test_expect_success 'absorb the git dir in a nested submodule' '
git status >actual.1 &&
git -C sub1/nested rev-parse HEAD >actual.2 &&
test_cmp expect.1 actual.1 &&
- test_cmp expect.2 actual.2
+ test_cmp expect.2 actual.2 &&
+
+ sub1_gitdir="$(git -C sub1 rev-parse --path-format=absolute --git-common-dir)" &&
+ sub1_nested_gitdir="$(git -C sub1/nested rev-parse --path-format=absolute --git-common-dir)" &&
+
+ test-tool path-utils relative_path "$sub1_gitdir" "$sub1_nested_gitdir" \
+ >expect &&
+ git -C sub1/nested config submodule.superprojectGitDir >actual &&
+
+ test_cmp expect actual
'
test_expect_success 're-setup nested submodule' '
@@ -130,4 +149,63 @@ test_expect_success 'absorbing fails for a submodule with multiple worktrees' '
test_i18ngrep "not supported" error
'
+test_expect_success 'absorbgitdirs works when called from a superproject worktree' '
+ # set up a worktree of the superproject
+ git worktree add wt &&
+ (
+ cd wt &&
+
+ # create a new unembedded git dir
+ git init sub4 &&
+ test_commit -C sub4 first &&
+ git submodule add ./sub4 &&
+ test_tick &&
+
+ # absorb the git dir
+ git submodule absorbgitdirs sub4 &&
+
+ # make sure the submodule noted the superproject gitdir correctly
+ submodule_gitdir="$(git -C sub4 rev-parse --absolute-git-dir)" &&
+ superproject_gitdir="$(git rev-parse --absolute-git-dir)" &&
+
+ test-tool path-utils relative_path "$superproject_gitdir" \
+ "$submodule_gitdir" >expect &&
+ git -C sub4 config submodule.superprojectGitDir >actual &&
+
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'absorbgitdirs works with a submodule with worktree config' '
+ # reuse the worktree of the superproject
+ (
+ cd wt &&
+
+ # create a new unembedded git dir
+ git init sub5 &&
+ test_commit -C sub5 first &&
+ git submodule add ./sub5 &&
+ test_tick &&
+
+ # turn on worktree configs for submodule
+ git -C sub5 config extensions.worktreeConfig true &&
+
+ # absorb the git dir
+ git submodule absorbgitdirs sub5 &&
+
+ # make sure the submodule noted the superproject gitdir correctly
+ submodule_gitdir="$(git -C sub5 rev-parse --absolute-git-dir)" &&
+ superproject_gitdir="$(git rev-parse --absolute-git-dir)" &&
+
+ test-tool path-utils relative_path "$superproject_gitdir" \
+ "$submodule_gitdir" >expect &&
+ git -C sub5 config submodule.superprojectGitDir >actual &&
+
+ test_cmp expect actual &&
+
+ # make sure the config went into the submodule config.worktree
+ test_file_not_empty "$submodule_gitdir/config.worktree"
+ )
+'
+
test_done
--
2.34.0.rc1.387.gb447b232ab-goog
next prev parent reply other threads:[~2021-11-17 0:57 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 ` Emily Shaffer [this message]
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
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=20211117005701.371808-4-emilyshaffer@google.com \
--to=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
/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).