From: Shreyansh Paliwal <shreyanshpaliwalcmsmn@gmail•com>
To: git@vger•kernel.org
Cc: Shreyansh Paliwal <shreyanshpaliwalcmsmn@gmail•com>
Subject: [PATCH] add-patch: use repository instance from add_i_state instead of the_repository
Date: Tue, 17 Mar 2026 21:20:29 +0530 [thread overview]
Message-ID: <20260317155230.619378-1-shreyanshpaliwalcmsmn@gmail.com> (raw)
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.
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
next reply other threads:[~2026-03-17 15:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-17 15:50 Shreyansh Paliwal [this message]
2026-03-17 16:47 ` [PATCH] add-patch: use repository instance from add_i_state instead of the_repository Junio C Hamano
2026-03-17 16:51 ` Shreyansh Paliwal
2026-03-17 18:04 ` Junio C Hamano
2026-03-17 20:10 ` Junio C Hamano
2026-03-17 20:25 ` Junio C Hamano
2026-03-18 7:01 ` Shreyansh Paliwal
2026-03-18 9:00 ` [PATCH v2 ] add-patch: use repository instance from add_p_state " Shreyansh Paliwal
2026-03-18 16:43 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260317155230.619378-1-shreyanshpaliwalcmsmn@gmail.com \
--to=shreyanshpaliwalcmsmn@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox