From: Emily Shaffer <emilyshaffer@google.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/7] grep: use submodule-ODB-as-alternate lazy-addition
Date: Wed, 11 Aug 2021 14:36:39 -0700 [thread overview]
Message-ID: <YRRC528p06ByShE5@google.com> (raw)
In-Reply-To: <31e9b914c4bb500a98fbb14674c93a0d8ece47a2.1628618950.git.jonathantanmy@google.com>
On Tue, Aug 10, 2021 at 11:28:40AM -0700, Jonathan Tan wrote:
>
> In the parent commit, Git was taught to add submodule ODBs as alternates
> lazily, but grep does not use this because it computes the path to add
> directly, not going through add_submodule_odb(). Add an equivalent to
> add_submodule_odb() that takes the exact ODB path and teach grep to use
> it.
>
> Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
> ---
> builtin/grep.c | 2 +-
> submodule.c | 5 +++++
> submodule.h | 1 +
> 3 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/builtin/grep.c b/builtin/grep.c
> index 7d2f8e5adb..87bcb934a2 100644
> --- a/builtin/grep.c
> +++ b/builtin/grep.c
> @@ -450,7 +450,7 @@ static int grep_submodule(struct grep_opt *opt,
> * store is no longer global and instead is a member of the repository
> * object.
> */
> - add_to_alternates_memory(subrepo.objects->odb->path);
> + add_submodule_odb_by_path(subrepo.objects->odb->path);
I had wondered whether we can entirely drop add_to_alternates_memory()
but I see on second reading that that's still used by
register_all_submodule_odb...(). I wonder if it can become static in
submodule.c to prevent users from dodging the envvar+BUG()?
> obj_read_unlock();
>
> memcpy(&subopt, opt, sizeof(subopt));
> diff --git a/submodule.c b/submodule.c
> index 8fde90e906..8de1aecaeb 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -187,6 +187,11 @@ int add_submodule_odb(const char *path)
> return ret;
> }
>
> +void add_submodule_odb_by_path(const char *path)
> +{
> + string_list_insert(&added_submodule_odb_paths, xstrdup(path));
> +}
> +
> int register_all_submodule_odb_as_alternates(void)
> {
> int i;
> diff --git a/submodule.h b/submodule.h
> index c252784bc2..17a06cc43b 100644
> --- a/submodule.h
> +++ b/submodule.h
> @@ -104,6 +104,7 @@ int bad_to_remove_submodule(const char *path, unsigned flags);
> * the_repository.
> */
> int add_submodule_odb(const char *path);
Curious whether add_submodule_odb() can be reduced by calling
add_submodule_odb_by_path() internally.
> +void add_submodule_odb_by_path(const char *path);
> int register_all_submodule_odb_as_alternates(void);
>
> /*
> --
> 2.33.0.rc1.237.g0d66db33f3-goog
>
These are all pretty minor comments; with or without them,
Reviewed-by: Emily Shaffer <emilyshaffer@google.com>
next prev parent reply other threads:[~2021-08-11 21:36 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-10 18:28 [PATCH 0/7] In grep, no adding submodule ODB as alternates Jonathan Tan
2021-08-10 18:28 ` [PATCH 1/7] submodule: lazily add submodule ODBs " Jonathan Tan
2021-08-10 21:13 ` Junio C Hamano
2021-08-13 16:53 ` Jonathan Tan
2021-08-11 21:33 ` Emily Shaffer
2021-08-13 16:23 ` Jonathan Tan
2021-08-10 18:28 ` [PATCH 2/7] grep: use submodule-ODB-as-alternate lazy-addition Jonathan Tan
2021-08-11 21:36 ` Emily Shaffer [this message]
2021-08-13 16:31 ` Jonathan Tan
2021-08-10 18:28 ` [PATCH 3/7] grep: typesafe versions of grep_source_init Jonathan Tan
2021-08-10 21:38 ` Junio C Hamano
2021-08-11 21:42 ` Emily Shaffer
2021-08-11 23:07 ` Ramsay Jones
2021-08-13 16:32 ` Jonathan Tan
2021-08-11 22:45 ` Matheus Tavares Bernardino
2021-08-12 16:49 ` Junio C Hamano
2021-08-13 16:33 ` Jonathan Tan
2021-08-10 18:28 ` [PATCH 4/7] grep: read submodule entry with explicit repo Jonathan Tan
2021-08-11 21:44 ` Emily Shaffer
2021-08-13 16:39 ` Jonathan Tan
2021-08-10 18:28 ` [PATCH 5/7] grep: allocate subrepos on heap Jonathan Tan
2021-08-11 21:50 ` Emily Shaffer
2021-08-13 16:42 ` Jonathan Tan
2021-08-10 18:28 ` [PATCH 6/7] grep: add repository to OID grep sources Jonathan Tan
2021-08-11 21:52 ` Emily Shaffer
2021-08-13 16:44 ` Jonathan Tan
2021-08-11 23:28 ` Matheus Tavares Bernardino
2021-08-13 16:47 ` Jonathan Tan
2021-08-10 18:28 ` [PATCH 7/7] t7814: show lack of alternate ODB-adding Jonathan Tan
2021-08-11 21:55 ` Emily Shaffer
2021-08-11 22:22 ` Matheus Tavares Bernardino
2021-08-13 16:50 ` Jonathan Tan
2021-08-11 21:29 ` [PATCH 0/7] In grep, no adding submodule ODB as alternates Emily Shaffer
2021-08-11 22:49 ` Josh Steadmon
2021-08-13 21:05 ` [PATCH v2 0/8] " Jonathan Tan
2021-08-13 21:05 ` [PATCH v2 1/8] submodule: lazily add submodule ODBs " Jonathan Tan
2021-08-13 21:05 ` [PATCH v2 2/8] grep: use submodule-ODB-as-alternate lazy-addition Jonathan Tan
2021-08-13 21:05 ` [PATCH v2 3/8] grep: typesafe versions of grep_source_init Jonathan Tan
2021-08-16 15:06 ` Matheus Tavares Bernardino
2021-08-13 21:05 ` [PATCH v2 4/8] grep: read submodule entry with explicit repo Jonathan Tan
2021-08-13 21:05 ` [PATCH v2 5/8] grep: allocate subrepos on heap Jonathan Tan
2021-08-13 21:44 ` Junio C Hamano
2021-08-16 19:42 ` Jonathan Tan
2021-08-13 21:05 ` [PATCH v2 6/8] grep: add repository to OID grep sources Jonathan Tan
2021-08-16 14:48 ` Matheus Tavares Bernardino
2021-08-16 19:44 ` Jonathan Tan
2021-08-13 21:05 ` [PATCH v2 7/8] submodule-config: pass repo upon blob config read Jonathan Tan
2021-08-16 14:32 ` Matheus Tavares Bernardino
2021-08-16 19:57 ` Matheus Tavares Bernardino
2021-08-16 20:02 ` Jonathan Tan
2021-08-16 15:48 ` Matheus Tavares Bernardino
2021-08-16 20:09 ` Jonathan Tan
2021-08-16 20:57 ` Jonathan Tan
2021-08-13 21:05 ` [PATCH v2 8/8] t7814: show lack of alternate ODB-adding Jonathan Tan
2021-08-16 15:14 ` [PATCH v2 0/8] In grep, no adding submodule ODB as alternates Matheus Tavares Bernardino
2021-08-16 21:09 ` [PATCH v3 " Jonathan Tan
2021-08-16 21:09 ` [PATCH v3 1/8] submodule: lazily add submodule ODBs " Jonathan Tan
2021-08-16 21:09 ` [PATCH v3 2/8] grep: use submodule-ODB-as-alternate lazy-addition Jonathan Tan
2021-08-16 21:09 ` [PATCH v3 3/8] grep: typesafe versions of grep_source_init Jonathan Tan
2021-08-16 21:09 ` [PATCH v3 4/8] grep: read submodule entry with explicit repo Jonathan Tan
2021-08-16 21:09 ` [PATCH v3 5/8] grep: allocate subrepos on heap Jonathan Tan
2021-08-16 21:09 ` [PATCH v3 6/8] grep: add repository to OID grep sources Jonathan Tan
2021-09-27 12:08 ` Ævar Arnfjörð Bjarmason
2021-09-27 16:45 ` [RFC PATCH 0/3] grep: don'\''t add subrepos to in-memory alternates Matheus Tavares
2021-09-27 17:30 ` Ævar Arnfjörð Bjarmason
2021-08-16 21:09 ` [PATCH v3 7/8] submodule-config: pass repo upon blob config read Jonathan Tan
2021-08-16 21:09 ` [PATCH v3 8/8] t7814: show lack of alternate ODB-adding Jonathan Tan
2021-08-17 19:29 ` [PATCH v3 0/8] In grep, no adding submodule ODB as alternates Matheus Tavares Bernardino
2021-09-08 0:26 ` Junio C Hamano
2021-09-08 15:31 ` Matheus Tavares Bernardino
2021-09-08 18:45 ` 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=YRRC528p06ByShE5@google.com \
--to=emilyshaffer@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
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).