From: Matheus Tavares <matheus.bernardino@usp.br>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Brandon Williams" <bwilliams.eng@gmail.com>,
"Antonio Ospite" <ao2@ao2.it>,
"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH 2/2] submodule: pass repo instead of adding to alternates list
Date: Mon, 26 Aug 2019 20:57:28 -0300 [thread overview]
Message-ID: <4619e04ecca575e7eb5f73f555be0bb55d11385e.1566863604.git.matheus.bernardino@usp.br> (raw)
In-Reply-To: <cover.1566863604.git.matheus.bernardino@usp.br>
Previously, config_with_options() wouldn't handle arbitrary repositories
besides the_repository. Because of that, when retrieving .gitmodules
from the cache, config_from_gitmodules() first needed to add the object
directories of the given repo to the in-memory alternates list. But we
have repo_config_with_options() now, which takes a repository as
argument. So let's use it and remove the call to
add_to_alternates_memory(). This should bring better performance to
commands using the function (there'll be fewer odb entries to process)
besides saving memory (repos may be free'd right after use whereas
the_repository's alternates list doesn't).
While we are here, let's also adjust the comment on top of
config_from_gitmodules() to be explicit that it also handles the case
where .gitmodules is not present at the working tree.
Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
---
submodule-config.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/submodule-config.c b/submodule-config.c
index 1d28b17071..8271aa3834 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -616,7 +616,8 @@ static void submodule_cache_check_init(struct repository *repo)
* the repository.
*
* Runs the provided config function on the '.gitmodules' file found in the
- * working directory.
+ * working directory. If the file is not present, tries to retrieve it from
+ * the staging area or HEAD.
*/
static void config_from_gitmodules(config_fn_t fn, struct repository *repo, void *data)
{
@@ -633,13 +634,11 @@ static void config_from_gitmodules(config_fn_t fn, struct repository *repo, void
} else if (repo_get_oid(repo, GITMODULES_INDEX, &oid) >= 0 ||
repo_get_oid(repo, GITMODULES_HEAD, &oid) >= 0) {
config_source.blob = oidstr = xstrdup(oid_to_hex(&oid));
- if (repo != the_repository)
- add_to_alternates_memory(repo->objects->odb->path);
} else {
goto out;
}
- config_with_options(fn, data, &config_source, &opts);
+ repo_config_with_options(repo, fn, data, &config_source, &opts);
out:
free(oidstr);
--
2.22.0
prev parent reply other threads:[~2019-08-26 23:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-26 23:57 [PATCH 0/2] config: make config_with_options() handle any repo Matheus Tavares
2019-08-26 23:57 ` [PATCH 1/2] config: allow config_with_options() to " Matheus Tavares
2019-08-27 9:26 ` Duy Nguyen
2019-08-27 23:46 ` Matheus Tavares Bernardino
2019-08-29 4:24 ` Matheus Tavares Bernardino
2019-08-29 9:31 ` Duy Nguyen
2019-08-29 14:00 ` Jeff King
2019-08-29 16:44 ` Matheus Tavares Bernardino
2019-08-30 9:09 ` Duy Nguyen
2019-08-26 23:57 ` Matheus Tavares [this message]
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=4619e04ecca575e7eb5f73f555be0bb55d11385e.1566863604.git.matheus.bernardino@usp.br \
--to=matheus.bernardino@usp.br \
--cc=ao2@ao2.it \
--cc=bwilliams.eng@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.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).