From: Junio C Hamano Date: Wed, 18 Mar 2026 16:43:03 GMT Subject: Re: [PATCH v2 ] add-patch: use repository instance from add_p_state instead of the_repository Message-ID: In-Reply-To: <20260318090546.1213077-1-shreyanshpaliwalcmsmn@gmail.com> Shreyansh Paliwal writes: > Functions parse_diff(), edit_hunk_manually() and patch_update_file() use > the_repository even though a repository instance is already available via > struct add_p_state *s. > Use '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 follows recent refactoring that removed 'add_i_state' and moved > repository pointer and other add-patch config into struct add_p_state [1]. > This aligns with the ongoing effort to reduce usage of the_repository > global state. > > [1]- https://lore.kernel.org/git/20260302-pks-history-split-v1-3-444fc987a324@pks.im/ > > Signed-off-by: Shreyansh Paliwal > --- > Changes in v2: > - made changes on top of ps/history-split and used s->r instead of s->s.r Good. Brief and clear description on what this patch was based on. Thanks. > > add-patch.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/add-patch.c b/add-patch.c > index 4e28e5c187..f27edcbe8d 100644 > --- a/add-patch.c > +++ b/add-patch.c > @@ -558,8 +558,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->r, "HEAD", &oid) ? > + empty_tree_oid_hex(s->r->hash_algo) : s->revision); > } > color_arg_index = args.nr; > /* Use `--no-color` explicitly, just in case `diff.color = always`. */ > @@ -1271,7 +1271,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->r, &s->buf, > "addp-hunk-edit.diff", NULL) < 0) > return -1; > > @@ -1679,7 +1679,7 @@ static size_t patch_update_file(struct add_p_state *s, > if (file_diff->hunk_nr) { > if (rendered_hunk_index != hunk_index) { > if (use_pager) { > - setup_pager(the_repository); > + setup_pager(s->r); > sigchain_push(SIGPIPE, SIG_IGN); > } > render_hunk(s, hunk, 0, colored, &s->buf); > -- > 2.53.0