From: Stefan Beller <sbeller@google.com> To: git@vger.kernel.org Cc: jonathantanmy@google.com, Stefan Beller <sbeller@google.com> Subject: [PATCH 8/9] submodule.c: fetch in submodules git directory instead of in worktree Date: Wed, 28 Nov 2018 16:27:55 -0800 Message-ID: <20181129002756.167615-9-sbeller@google.com> (raw) In-Reply-To: <20181129002756.167615-1-sbeller@google.com> Keep the properties introduced in 10f5c52656 (submodule: avoid auto-discovery in prepare_submodule_repo_env(), 2016-09-01), by fixating the git directory of the submodule. Signed-off-by: Stefan Beller <sbeller@google.com> --- submodule.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/submodule.c b/submodule.c index 77ace5e784..d1b6646f42 100644 --- a/submodule.c +++ b/submodule.c @@ -494,6 +494,12 @@ void prepare_submodule_repo_env(struct argv_array *out) DEFAULT_GIT_DIR_ENVIRONMENT); } +static void prepare_submodule_repo_env_in_gitdir(struct argv_array *out) +{ + prepare_submodule_repo_env_no_git_dir(out); + argv_array_pushf(out, "%s=.", GIT_DIR_ENVIRONMENT); +} + /* Helper function to display the submodule header line prior to the full * summary output. If it can locate the submodule objects directory it will * attempt to lookup both the left and right commits and put them into the @@ -1327,8 +1333,8 @@ static int get_next_submodule(struct child_process *cp, repo = get_submodule_repo_for(spf->r, submodule); if (repo) { child_process_init(cp); - cp->dir = xstrdup(repo->worktree); - prepare_submodule_repo_env(&cp->env_array); + cp->dir = xstrdup(repo->gitdir); + prepare_submodule_repo_env_in_gitdir(&cp->env_array); cp->git_cmd = 1; if (!spf->quiet) strbuf_addf(err, "Fetching submodule %s%s\n", -- 2.20.0.rc1.387.gf8505762e3-goog
next prev parent reply index Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-11-29 0:27 [PATCHv2 0/9] Resending sb/submodule-recursive-fetch-gets-the-tip Stefan Beller 2018-11-29 0:27 ` [PATCH 1/9] sha1-array: provide oid_array_filter Stefan Beller 2018-11-29 0:27 ` [PATCH 2/9] submodule.c: fix indentation Stefan Beller 2018-11-29 0:27 ` [PATCH 3/9] submodule.c: sort changed_submodule_names before searching it Stefan Beller 2018-12-05 0:12 ` Jonathan Tan 2018-11-29 0:27 ` [PATCH 4/9] submodule.c: tighten scope of changed_submodule_names struct Stefan Beller 2018-11-29 0:27 ` [PATCH 5/9] submodule: store OIDs in changed_submodule_names Stefan Beller 2018-11-29 0:27 ` [PATCH 6/9] repository: repo_submodule_init to take a submodule struct Stefan Beller 2018-11-29 0:27 ` [PATCH 7/9] submodule: migrate get_next_submodule to use repository structs Stefan Beller 2018-12-05 0:17 ` Jonathan Tan 2019-02-02 1:58 ` Jonathan Nieder 2018-11-29 0:27 ` Stefan Beller [this message] 2018-12-05 0:38 ` [PATCH 8/9] submodule.c: fetch in submodules git directory instead of in worktree Jonathan Tan 2018-11-29 0:27 ` [PATCH 9/9] fetch: try fetching submodules if needed objects were not fetched Stefan Beller 2018-12-05 1:07 ` Jonathan Tan 2018-12-06 21:26 ` [PATCH] fetch: ensure submodule objects fetched Stefan Beller 2018-12-09 1:57 ` Junio C Hamano 2018-12-05 3:10 ` [PATCHv2 0/9] Resending sb/submodule-recursive-fetch-gets-the-tip Junio C Hamano 2018-12-06 21:59 ` Stefan Beller 2018-12-07 0:25 ` Josh Steadmon 2019-01-15 1:38 ` Jonathan Nieder
Reply instructions: You may reply publically 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=20181129002756.167615-9-sbeller@google.com \ --to=sbeller@google.com \ --cc=git@vger.kernel.org \ --cc=jonathantanmy@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
git@vger.kernel.org list mirror (unofficial, one of many) Archives are clonable: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.org/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ or Tor2web: https://www.tor2web.org/ AGPL code for this site: git clone https://public-inbox.org/ public-inbox