From: Josh Steadmon <steadmon@google.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v3 4/7] merge-{ort,recursive}: remove add_submodule_odb()
Date: Thu, 7 Oct 2021 11:34:12 -0700 [thread overview]
Message-ID: <YV89pOZh+qj/oplL@google.com> (raw)
In-Reply-To: <e4a1be22c8759d495cf00d71a06227b87d433ecf.1632956589.git.jonathantanmy@google.com>
On 2021.09.29 16:06, Jonathan Tan wrote:
> After the parent commit and some of its ancestors, the only place
> commits are being accessed through alternates is in the user-facing
> message formatting code. Fix those, and remove the add_submodule_odb()
> calls.
>
> Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
> ---
> merge-ort.c | 18 ++++-------------
> merge-recursive.c | 41 +++++++++++++++++++-------------------
> strbuf.c | 12 ++++++++---
> strbuf.h | 6 ++++--
> t/t6437-submodule-merge.sh | 3 +++
> 5 files changed, 40 insertions(+), 40 deletions(-)
>
> diff --git a/strbuf.c b/strbuf.c
> index c8a5789694..b22e981655 100644
> --- a/strbuf.c
> +++ b/strbuf.c
> @@ -1059,15 +1059,21 @@ void strbuf_addftime(struct strbuf *sb, const char *fmt, const struct tm *tm,
> strbuf_setlen(sb, sb->len + len);
> }
>
> -void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid,
> - int abbrev_len)
> +void strbuf_repo_add_unique_abbrev(struct strbuf *sb, struct repository *repo,
> + const struct object_id *oid, int abbrev_len)
> {
> int r;
> strbuf_grow(sb, GIT_MAX_HEXSZ + 1);
> - r = find_unique_abbrev_r(sb->buf + sb->len, oid, abbrev_len);
> + r = repo_find_unique_abbrev_r(repo, sb->buf + sb->len, oid, abbrev_len);
> strbuf_setlen(sb, sb->len + r);
> }
>
> +void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid,
> + int abbrev_len)
> +{
> + strbuf_repo_add_unique_abbrev(sb, the_repository, oid, abbrev_len);
> +}
> +
Should strbuf_add_unique_abbrev() be inlined and moved to the header?
next prev parent reply other threads:[~2021-10-07 18:34 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-21 16:51 [PATCH 0/9] No more adding submodule ODB as alternate Jonathan Tan
2021-09-21 16:51 ` [PATCH 1/9] refs: make _advance() check struct repo, not flag Jonathan Tan
2021-09-23 1:00 ` Junio C Hamano
2021-09-24 17:56 ` Jonathan Tan
2021-09-24 19:55 ` Junio C Hamano
2021-09-24 18:13 ` Jeff King
2021-09-24 18:28 ` Jonathan Tan
2021-09-21 16:51 ` [PATCH 2/9] refs: add repo paramater to _iterator_peel() Jonathan Tan
2021-09-21 16:51 ` [PATCH 3/9] refs iterator: support non-the_repository advance Jonathan Tan
2021-09-21 16:51 ` [PATCH 4/9] refs: teach refs_for_each_ref() arbitrary repos Jonathan Tan
2021-09-21 16:51 ` [PATCH 5/9] merge-{ort,recursive}: remove add_submodule_odb() Jonathan Tan
2021-09-28 0:29 ` Elijah Newren
2021-09-21 16:51 ` [PATCH 6/9] object-file: only register submodule ODB if needed Jonathan Tan
2021-09-21 16:51 ` [PATCH 7/9] submodule: pass repo to check_has_commit() Jonathan Tan
2021-09-21 16:51 ` [PATCH 8/9] refs: change refs_for_each_ref_in() to take repo Jonathan Tan
2021-09-21 16:51 ` [PATCH 9/9] submodule: trace adding submodule ODB as alternate Jonathan Tan
2021-09-23 18:05 ` [PATCH 0/9] No more " Junio C Hamano
2021-09-28 20:10 ` [PATCH v2 " Jonathan Tan
2021-09-28 20:10 ` [PATCH v2 1/9] refs: plumb repo param in begin-iterator functions Jonathan Tan
2021-09-28 22:24 ` Junio C Hamano
2021-09-28 20:10 ` [PATCH v2 2/9] refs: teach arbitrary repo support to iterators Jonathan Tan
2021-09-28 22:35 ` Junio C Hamano
2021-09-29 17:04 ` Jonathan Tan
2021-09-28 20:10 ` [PATCH v2 3/9] refs: peeling non-the_repository iterators is BUG Jonathan Tan
2021-09-28 20:10 ` [PATCH v2 4/9] refs: teach refs_for_each_ref() arbitrary repos Jonathan Tan
2021-09-28 22:49 ` Junio C Hamano
2021-09-28 20:10 ` [PATCH v2 5/9] merge-{ort,recursive}: remove add_submodule_odb() Jonathan Tan
2021-09-28 20:10 ` [PATCH v2 6/9] object-file: only register submodule ODB if needed Jonathan Tan
2021-09-28 20:10 ` [PATCH v2 7/9] submodule: pass repo to check_has_commit() Jonathan Tan
2021-09-28 20:10 ` [PATCH v2 8/9] refs: change refs_for_each_ref_in() to take repo Jonathan Tan
2021-09-28 20:10 ` [PATCH v2 9/9] submodule: trace adding submodule ODB as alternate Jonathan Tan
2021-09-29 23:06 ` [PATCH v3 0/7] No more " Jonathan Tan
2021-09-29 23:06 ` [PATCH v3 1/7] refs: plumb repo into ref stores Jonathan Tan
2021-09-30 11:13 ` [PATCH] fixup! " Carlo Marcelo Arenas Belón
2021-10-06 17:42 ` Glen Choo
2021-10-08 20:05 ` Jonathan Tan
2021-10-08 20:07 ` Jonathan Tan
2021-10-07 18:33 ` [PATCH v3 1/7] " Josh Steadmon
2021-10-08 20:08 ` Jonathan Tan
2021-09-29 23:06 ` [PATCH v3 2/7] refs: teach arbitrary repo support to iterators Jonathan Tan
2021-10-07 19:31 ` Glen Choo
2021-10-08 20:12 ` Jonathan Tan
2021-09-29 23:06 ` [PATCH v3 3/7] refs: peeling non-the_repository iterators is BUG Jonathan Tan
2021-09-29 23:06 ` [PATCH v3 4/7] merge-{ort,recursive}: remove add_submodule_odb() Jonathan Tan
2021-10-07 18:34 ` Josh Steadmon [this message]
2021-10-08 20:19 ` Jonathan Tan
2021-09-29 23:06 ` [PATCH v3 5/7] object-file: only register submodule ODB if needed Jonathan Tan
2021-10-07 18:34 ` Josh Steadmon
2021-10-08 20:22 ` Jonathan Tan
2021-09-29 23:06 ` [PATCH v3 6/7] submodule: pass repo to check_has_commit() Jonathan Tan
2021-09-29 23:06 ` [PATCH v3 7/7] submodule: trace adding submodule ODB as alternate Jonathan Tan
2021-10-07 18:34 ` Josh Steadmon
2021-10-08 20:23 ` Jonathan Tan
2021-10-07 18:32 ` [PATCH v3 0/7] No more " Josh Steadmon
2021-10-08 21:08 ` [PATCH v4 " Jonathan Tan
2021-10-08 21:08 ` [PATCH v4 1/7] refs: plumb repo into ref stores Jonathan Tan
2021-10-08 21:08 ` [PATCH v4 2/7] refs: teach arbitrary repo support to iterators Jonathan Tan
2021-10-08 21:08 ` [PATCH v4 3/7] refs: peeling non-the_repository iterators is BUG Jonathan Tan
2021-10-08 21:08 ` [PATCH v4 4/7] merge-{ort,recursive}: remove add_submodule_odb() Jonathan Tan
2021-10-08 21:08 ` [PATCH v4 5/7] object-file: only register submodule ODB if needed Jonathan Tan
2021-10-08 21:08 ` [PATCH v4 6/7] submodule: pass repo to check_has_commit() Jonathan Tan
2021-10-08 21:08 ` [PATCH v4 7/7] submodule: trace adding submodule ODB as alternate Jonathan Tan
2021-10-12 22:10 ` [PATCH v4 0/7] No more " Glen Choo
2021-10-12 22:40 ` Josh Steadmon
2021-10-12 22:49 ` 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=YV89pOZh+qj/oplL@google.com \
--to=steadmon@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).