Re: [PATCH] add-patch: use repository instance from add_i_state instead of the_repository
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 17, 2026, 16:47 UTC
- Message-ID
- <xmqqzf46l7x1.fsf@gitster.g>
- In-Reply-To
- <20260317155230.619378-1-shreyanshpaliwalcmsmn@gmail.com>
Shreyansh Paliwal <shreyanshpaliwalcmsmn@gmail.com> writes:
Show 9 quoted lines
> Functions parse_diff(), edit_hunk_manually() and patch_update_file() use > the_repository even though a repository instance is already available via > struct add_i_state s which is defined in struct add_p_state *s. > > Use 's->s.r' instead of the_repository to avoid relying on global state. All > callers pass a valid add_p_state and this does not change any behavior. > > This aligns with the ongoing effort to reduce usage of the_repository global > state.
So we can call this "reduce" but cannot say "eliminate" yet, as the files uses comment_line_str?
The <environment.h> header lists some global variables inside "#ifndef USE_THE_REPOSITORY_VARIABLE/#endif" block, and the comment-line stuff is among them.
The patch looks correct. Will queue. Thanks.
Show 40 quoted lines
> Signed-off-by: Shreyansh Paliwal <shreyanshpaliwalcmsmn@gmail.com>
> ---
> add-patch.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/add-patch.c b/add-patch.c
> index 8c03f710d3..30df920723 100644
> --- a/add-patch.c
> +++ b/add-patch.c
> @@ -434,8 +434,8 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
> strvec_push(&args,
> /* could be on an unborn branch */
> !strcmp("HEAD", s->revision) &&
> - repo_get_oid(the_repository, "HEAD", &oid) ?
> - empty_tree_oid_hex(the_repository->hash_algo) : s->revision);
> + repo_get_oid(s->s.r, "HEAD", &oid) ?
> + empty_tree_oid_hex(s->s.r->hash_algo) : s->revision);
> }
> color_arg_index = args.nr;
> /* Use `--no-color` explicitly, just in case `diff.color = always`. */
> @@ -1147,7 +1147,7 @@ static int edit_hunk_manually(struct add_p_state *s, struct hunk *hunk)
> "removed, then the edit is\n"
> "aborted and the hunk is left unchanged.\n"));
>
> - if (strbuf_edit_interactively(the_repository, &s->buf,
> + if (strbuf_edit_interactively(s->s.r, &s->buf,
> "addp-hunk-edit.diff", NULL) < 0)
> return -1;
>
> @@ -1551,7 +1551,7 @@ static size_t patch_update_file(struct add_p_state *s, size_t idx)
> if (file_diff->hunk_nr) {
> if (rendered_hunk_index != hunk_index) {
> if (use_pager) {
> - setup_pager(the_repository);
> + setup_pager(s->s.r);
> sigchain_push(SIGPIPE, SIG_IGN);
> }
> render_hunk(s, hunk, 0, colored, &s->buf);
> --
> 2.53.0