Subject: Re: [PATCH v3 4/7] merge-{ort,recursive}: remove add_submodule_odb()

From: Josh Steadmon <[email-masked]>
Date: Thu, 7 Oct 2021 11:34:12 -0700

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 <[email-masked]>
> ---
>  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?