From: Brandon Williams <bmwill@google.com> To: git@vger.kernel.org Cc: Brandon Williams <bmwill@google.com> Subject: [PATCH] submodule: add config for where gitdirs are located Date: Thu, 16 Aug 2018 11:19:40 -0700 [thread overview] Message-ID: <20180816181940.46114-1-bmwill@google.com> (raw) In-Reply-To: <20180816024733.GB127655@aiede.svl.corp.google.com> Introduce the config "submodule.<name>.gitdirpath" which is used to indicate where a submodule's gitdir is located inside of a repository's "modules" directory. Signed-off-by: Brandon Williams <bmwill@google.com> --- Maybe something like this on top? Do you think we should disallow "../" in this config, even though it is a repository local configuration and not shipped in .gitmodules? submodule.c | 13 ++++++++++++- t/t7400-submodule-basic.sh | 10 ++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/submodule.c b/submodule.c index 4854d88ce8..0cb00a9f24 100644 --- a/submodule.c +++ b/submodule.c @@ -1966,16 +1966,27 @@ void submodule_name_to_gitdir(struct strbuf *buf, struct repository *r, const char *submodule_name) { size_t modules_len; + char *key; + char *gitdir_path; strbuf_git_common_path(buf, r, "modules/"); modules_len = buf->len; - strbuf_addstr(buf, submodule_name); + + key = xstrfmt("submodule.%s.gitdirpath", submodule_name); + if (!repo_config_get_string(r, key, &gitdir_path)) { + strbuf_addstr(buf, gitdir_path); + free(key); + free(gitdir_path); + return; + } + free(key); /* * If the submodule gitdir already exists using the old-fashioned * location (which uses the submodule name as-is, without munging it) * then return that. */ + strbuf_addstr(buf, submodule_name); if (!access(buf->buf, F_OK)) return; diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 963693332c..1555329a2f 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -1351,6 +1351,16 @@ test_expect_success 'resolve submodule gitdir in superprojects modules directory $(git -C superproject rev-parse --git-common-dir)/modules/sub/module EOF git -C superproject submodule--helper gitdir "sub/module" >actual && + test_cmp expect actual && + + # Test using "submodule.<name>.gitdirpath" config for where the submodules + # gitdir is located inside the superprojecs "modules" directory + mv superproject/.git/modules/sub/module superproject/.git/modules/submodule && + cat >expect <<-EOF && + $(git -C superproject rev-parse --git-common-dir)/modules/submodule + EOF + git -C superproject config "submodule.sub/module.gitdirpath" "submodule" && + git -C superproject submodule--helper gitdir "sub/module" >actual && test_cmp expect actual ' -- 2.18.0.865.gffc8e1a3cd6-goog
next prev parent reply other threads:[~2018-08-16 18:19 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-08-07 23:06 [RFC] submodule: munge paths to submodule git directories Brandon Williams 2018-08-07 23:25 ` Jonathan Nieder 2018-08-08 0:14 ` Junio C Hamano 2018-08-08 22:33 ` [PATCH 0/2] munge submodule names Brandon Williams 2018-08-08 22:33 ` [PATCH 1/2] submodule: create helper to build paths to submodule gitdirs Brandon Williams 2018-08-08 23:21 ` Stefan Beller 2018-08-09 0:45 ` Brandon Williams 2018-08-10 21:27 ` Junio C Hamano 2018-08-10 21:45 ` Brandon Williams 2018-08-08 22:33 ` [PATCH 2/2] submodule: munge paths to submodule git directories Brandon Williams 2018-08-09 21:26 ` Jeff King 2018-08-14 18:04 ` Brandon Williams 2018-08-14 18:57 ` Jonathan Nieder 2018-08-14 21:08 ` Stefan Beller 2018-08-14 21:12 ` Jonathan Nieder 2018-08-14 22:34 ` Stefan Beller 2018-08-16 2:34 ` Jonathan Nieder 2018-08-16 2:39 ` Stefan Beller 2018-08-16 2:47 ` Jonathan Nieder 2018-08-16 17:34 ` Brandon Williams 2018-08-16 18:19 ` Brandon Williams [this message] 2018-08-20 22:03 ` [PATCH] submodule: add config for where gitdirs are located Junio C Hamano 2018-08-16 15:07 ` [PATCH 2/2] submodule: munge paths to submodule git directories Junio C Hamano 2018-08-14 18:58 ` Jeff King 2018-08-28 21:35 ` Stefan Beller 2018-08-29 5:25 ` Jeff King 2018-08-29 18:10 ` Stefan Beller 2018-08-29 21:03 ` Jeff King 2018-08-29 21:10 ` Stefan Beller 2018-08-29 21:18 ` Jonathan Nieder 2018-08-29 21:27 ` Stefan Beller 2018-08-29 21:30 ` Jeff King 2018-08-29 21:09 ` Jonathan Nieder 2018-08-29 21:14 ` Stefan Beller 2018-08-29 21:25 ` Brandon Williams 2018-08-29 21:32 ` Jeff King 2018-08-16 0:19 ` Aaron Schrab 2019-01-15 1:25 ` [RFC] " Jonathan Nieder 2019-01-17 17:32 ` Jeff King 2019-01-17 17:57 ` Stefan Beller
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=20180816181940.46114-1-bmwill@google.com \ --to=bmwill@google.com \ --cc=git@vger.kernel.org \ --subject='Re: [PATCH] submodule: add config for where gitdirs are located' \ /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
Code repositories for project(s) associated with this 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).