From: Philip Peterson <philip.c.peterson@xxxxxxxxx>
Because usage of the global the_repository is deprecated, remove
the usage of it in favor of a passed arg representing the repository.
Signed-off-by: Philip Peterson <philip.c.peterson@xxxxxxxxx>
---
add-patch.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/add-patch.c b/add-patch.c
index 2252895c280..b7f09122e1f 100644
--- a/add-patch.c
+++ b/add-patch.c
@@ -399,7 +399,7 @@ static void complete_file(char marker, struct hunk *hunk)
hunk->splittable_into++;
}
-static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
+static int parse_diff(struct repository *r, struct add_p_state *s, const struct pathspec *ps)
{
struct strvec args = STRVEC_INIT;
const char *diff_algorithm = s->s.interactive_diff_algorithm;
@@ -419,7 +419,7 @@ 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) ?
+ repo_get_oid(r, "HEAD", &oid) ?
empty_tree_oid_hex() : s->revision);
}
color_arg_index = args.nr;
@@ -1768,7 +1768,7 @@ int run_add_p(struct repository *r, enum add_p_mode mode,
(!s.mode->index_only &&
repo_refresh_and_write_index(r, REFRESH_QUIET, 0, 1,
NULL, NULL, NULL) < 0) ||
- parse_diff(&s, ps) < 0) {
+ parse_diff(r, &s, ps) < 0) {
add_p_state_clear(&s);
return -1;
}
--
gitgitgadget
