From: Glen Choo <chooglen@google.com>
To: git@vger.kernel.org
Cc: "Glen Choo" <chooglen@google.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Atharva Raykar" <raykar.ath@gmail.com>,
"Emily Shaffer" <emilyshaffer@google.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Josh Steadmon" <steadmon@google.com>,
"Christian Couder" <christian.couder@gmail.com>,
"Shourya Shukla" <periperidip@gmail.com>
Subject: [PATCH 10/13] submodule--helper: allow setting superprefix for init_submodule()
Date: Mon, 28 Feb 2022 16:08:13 -0800 [thread overview]
Message-ID: <20220301000816.56177-11-chooglen@google.com> (raw)
In-Reply-To: <20220301000816.56177-1-chooglen@google.com>
From: Atharva Raykar <raykar.ath@gmail.com>
We allow callers of the `init_submodule()` function to optionally
override the superprefix from the environment.
We need to enable this option because in our conversion of the update
command that will follow, the '--init' option will be handled through
this API. We will need to change the superprefix at that time to ensure
the display paths show correctly in the output messages.
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Shourya Shukla <periperidip@gmail.com>
Signed-off-by: Atharva Raykar <raykar.ath@gmail.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin/submodule--helper.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 3598069de5..c3760f511d 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -593,18 +593,22 @@ static int module_foreach(int argc, const char **argv, const char *prefix)
struct init_cb {
const char *prefix;
+ const char *superprefix;
unsigned int flags;
};
#define INIT_CB_INIT { 0 }
static void init_submodule(const char *path, const char *prefix,
- unsigned int flags)
+ const char *superprefix, unsigned int flags)
{
const struct submodule *sub;
struct strbuf sb = STRBUF_INIT;
char *upd = NULL, *url = NULL, *displaypath;
- displaypath = get_submodule_displaypath(path, prefix);
+ /* try superprefix from the environment, if it is not passed explicitly */
+ if (!superprefix)
+ superprefix = get_super_prefix();
+ displaypath = do_get_submodule_displaypath(path, prefix, superprefix);
sub = submodule_from_path(the_repository, null_oid(), path);
@@ -678,7 +682,7 @@ static void init_submodule(const char *path, const char *prefix,
static void init_submodule_cb(const struct cache_entry *list_item, void *cb_data)
{
struct init_cb *info = cb_data;
- init_submodule(list_item->name, info->prefix, info->flags);
+ init_submodule(list_item->name, info->prefix, info->superprefix, info->flags);
}
static int module_init(int argc, const char **argv, const char *prefix)
--
2.33.GIT
next prev parent reply other threads:[~2022-03-01 0:08 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-01 0:08 [PATCH 00/13] submodule: convert parts of 'update' to C Glen Choo
2022-03-01 0:08 ` [PATCH 01/13] submodule tests: test for init and update failure output Glen Choo
2022-03-01 0:08 ` [PATCH 02/13] submodule--helper: remove update-module-mode Glen Choo
2022-03-01 0:08 ` [PATCH 03/13] submodule--helper: reorganize code for sh to C conversion Glen Choo
2022-03-01 0:08 ` [PATCH 04/13] submodule--helper run-update-procedure: remove --suboid Glen Choo
2022-03-01 0:08 ` [PATCH 05/13] submodule--helper: remove ensure-core-worktree Glen Choo
2022-03-01 0:08 ` [PATCH 06/13] submodule--helper: get remote names from any repository Glen Choo
2022-03-01 2:46 ` Junio C Hamano
2022-03-01 4:26 ` Glen Choo
2022-03-01 0:08 ` [PATCH 07/13] submodule--helper: don't use bitfield indirection for parse_options() Glen Choo
2022-03-01 0:08 ` [PATCH 08/13] submodule--helper run-update-procedure: learn --remote Glen Choo
2022-03-01 0:08 ` [PATCH 09/13] submodule--helper: refactor get_submodule_displaypath() Glen Choo
2022-03-01 0:08 ` Glen Choo [this message]
2022-03-01 0:08 ` [PATCH 11/13] submodule--helper update-clone: learn --init Glen Choo
2022-03-01 0:08 ` [PATCH 12/13] submodule update: add tests for --filter Glen Choo
2022-03-01 0:08 ` [PATCH 13/13] submodule--helper update-clone: check for --filter and --init Glen Choo
2022-03-01 1:29 ` [PATCH 00/13] submodule: convert parts of 'update' to C Glen Choo
2022-03-01 4:41 ` [PATCH v2 " Glen Choo
2022-03-01 4:41 ` [PATCH v2 01/13] submodule tests: test for init and update failure output Glen Choo
2022-03-01 4:41 ` [PATCH v2 02/13] submodule--helper: remove update-module-mode Glen Choo
2022-03-01 4:41 ` [PATCH v2 03/13] submodule--helper: reorganize code for sh to C conversion Glen Choo
2022-03-01 4:41 ` [PATCH v2 04/13] submodule--helper run-update-procedure: remove --suboid Glen Choo
2022-03-01 4:41 ` [PATCH v2 05/13] submodule--helper: remove ensure-core-worktree Glen Choo
2022-03-01 4:41 ` [PATCH v2 06/13] submodule--helper: get remote names from any repository Glen Choo
2022-03-01 8:01 ` Ævar Arnfjörð Bjarmason
2022-03-01 4:41 ` [PATCH v2 07/13] submodule--helper: don't use bitfield indirection for parse_options() Glen Choo
2022-03-01 4:41 ` [PATCH v2 08/13] submodule--helper run-update-procedure: learn --remote Glen Choo
2022-03-01 4:41 ` [PATCH v2 09/13] submodule--helper: refactor get_submodule_displaypath() Glen Choo
2022-03-01 8:05 ` Ævar Arnfjörð Bjarmason
2022-03-01 4:41 ` [PATCH v2 10/13] submodule--helper: allow setting superprefix for init_submodule() Glen Choo
2022-03-01 4:41 ` [PATCH v2 11/13] submodule--helper update-clone: learn --init Glen Choo
2022-03-01 4:41 ` [PATCH v2 12/13] submodule update: add tests for --filter Glen Choo
2022-03-01 8:07 ` Ævar Arnfjörð Bjarmason
2022-03-01 18:30 ` Glen Choo
2022-03-01 4:41 ` [PATCH v2 13/13] submodule--helper update-clone: check for --filter and --init Glen Choo
2022-03-01 7:21 ` Ævar Arnfjörð Bjarmason
2022-03-01 7:34 ` Junio C Hamano
2022-03-01 18:34 ` Glen Choo
2022-03-03 10:06 ` Ævar Arnfjörð Bjarmason
2022-03-03 0:57 ` [PATCH v3 00/13] submodule: convert parts of 'update' to C Glen Choo
2022-03-03 0:57 ` [PATCH v3 01/13] submodule tests: test for init and update failure output Glen Choo
2022-03-03 0:57 ` [PATCH v3 02/13] submodule--helper: remove update-module-mode Glen Choo
2022-03-03 0:57 ` [PATCH v3 03/13] submodule--helper: reorganize code for sh to C conversion Glen Choo
2022-03-03 0:57 ` [PATCH v3 04/13] submodule--helper run-update-procedure: remove --suboid Glen Choo
2022-03-03 21:09 ` Junio C Hamano
2022-03-03 0:57 ` [PATCH v3 05/13] submodule--helper: remove ensure-core-worktree Glen Choo
2022-03-03 21:25 ` Junio C Hamano
2022-03-04 21:27 ` Glen Choo
2022-03-03 0:57 ` [PATCH v3 06/13] submodule--helper: get remote names from any repository Glen Choo
2022-03-03 0:57 ` [PATCH v3 07/13] submodule--helper: don't use bitfield indirection for parse_options() Glen Choo
2022-03-03 0:57 ` [PATCH v3 08/13] submodule--helper run-update-procedure: learn --remote Glen Choo
2022-03-03 21:35 ` Junio C Hamano
2022-03-04 21:29 ` Glen Choo
2022-03-03 0:57 ` [PATCH v3 09/13] submodule--helper: refactor get_submodule_displaypath() Glen Choo
2022-03-03 0:57 ` [PATCH v3 10/13] submodule--helper: allow setting superprefix for init_submodule() Glen Choo
2022-03-03 0:57 ` [PATCH v3 11/13] submodule--helper update-clone: learn --init Glen Choo
2022-03-03 0:57 ` [PATCH v3 12/13] submodule update: add tests for --filter Glen Choo
2022-03-03 0:57 ` [PATCH v3 13/13] submodule--helper update-clone: check for --filter and --init Glen Choo
2022-03-03 9:58 ` [PATCH v3 00/13] submodule: convert parts of 'update' to C Ævar Arnfjörð Bjarmason
2022-03-03 21:41 ` Junio C Hamano
2022-03-05 0:13 ` [PATCH v4 " Glen Choo
2022-03-05 0:13 ` [PATCH v4 01/13] submodule tests: test for init and update failure output Glen Choo
2022-03-05 0:13 ` [PATCH v4 02/13] submodule--helper: remove update-module-mode Glen Choo
2022-03-05 0:13 ` [PATCH v4 03/13] submodule--helper: reorganize code for sh to C conversion Glen Choo
2022-03-05 0:13 ` [PATCH v4 04/13] submodule--helper run-update-procedure: remove --suboid Glen Choo
2022-03-05 0:13 ` [PATCH v4 05/13] submodule--helper: get remote names from any repository Glen Choo
2022-03-05 0:13 ` [PATCH v4 06/13] submodule--helper: don't use bitfield indirection for parse_options() Glen Choo
2022-03-05 0:13 ` [PATCH v4 07/13] submodule--helper run-update-procedure: learn --remote Glen Choo
2022-03-05 0:13 ` [PATCH v4 08/13] submodule--helper: refactor get_submodule_displaypath() Glen Choo
2022-03-05 0:13 ` [PATCH v4 09/13] submodule--helper: allow setting superprefix for init_submodule() Glen Choo
2022-03-05 0:13 ` [PATCH v4 10/13] submodule--helper update-clone: learn --init Glen Choo
2022-03-05 0:13 ` [PATCH v4 11/13] submodule--helper: remove ensure-core-worktree Glen Choo
2022-03-05 0:14 ` [PATCH v4 12/13] submodule update: add tests for --filter Glen Choo
2022-03-05 0:14 ` [PATCH v4 13/13] submodule--helper update-clone: check for --filter and --init Glen Choo
2022-03-05 0:40 ` [PATCH v4 00/13] submodule: convert parts of 'update' to C 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220301000816.56177-11-chooglen@google.com \
--to=chooglen@google.com \
--cc=avarab@gmail.com \
--cc=christian.couder@gmail.com \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=periperidip@gmail.com \
--cc=raykar.ath@gmail.com \
--cc=steadmon@google.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.
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 NNTP newsgroup(s).