add-patch: use repository instance from add_i_state instead of the_repository
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Shreyansh Paliwal committed
Mar 17, 2026 at 21:20 UTC
3cfe355ca74aae5cf90a4eca73a341732b0eb456
1 file changed
+4
-4
add-patch.c
+4
-4
@@ -434,8 +434,8 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
434
strvec_push(&args,
435
/* could be on an unborn branch */
436
!strcmp("HEAD", s->revision) &&
437
- repo_get_oid(the_repository, "HEAD", &oid) ?
438
- empty_tree_oid_hex(the_repository->hash_algo) : s->revision);
437
+ repo_get_oid(s->s.r, "HEAD", &oid) ?
438
+ empty_tree_oid_hex(s->s.r->hash_algo) : s->revision);
439
}
440
color_arg_index = args.nr;
441
/* 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)
1147
"removed, then the edit is\n"
1148
"aborted and the hunk is left unchanged.\n"));
1149
1150
- if (strbuf_edit_interactively(the_repository, &s->buf,
1150
+ if (strbuf_edit_interactively(s->s.r, &s->buf,
1151
"addp-hunk-edit.diff", NULL) < 0)
1152
return -1;
1153
@@ -1551,7 +1551,7 @@ static size_t patch_update_file(struct add_p_state *s, size_t idx)
1551
if (file_diff->hunk_nr) {
1552
if (rendered_hunk_index != hunk_index) {
1553
if (use_pager) {
1554
- setup_pager(the_repository);
1554
+ setup_pager(s->s.r);
1555
sigchain_push(SIGPIPE, SIG_IGN);
1556
}
1557
render_hunk(s, hunk, 0, colored, &s->buf);