Signed-off-by: Stefan Beller <[email protected]>
---
commit.c | 8 ++++----
commit.h | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/commit.c b/commit.c
index 900ecf84b8..a14933b208 100644
--- a/commit.c
+++ b/commit.c
@@ -1049,18 +1049,18 @@ int is_descendant_of(struct commit *commit, struct
commit_list *with_commit)
/*
* Is "commit" an ancestor of one of the "references"?
*/
-int in_merge_bases_many_the_repository(struct commit *commit, int
nr_reference, struct commit **reference)
+int in_merge_bases_many(struct repository *r, struct commit *commit, int
nr_reference, struct commit **reference)
{
struct commit_list *bases;
int ret = 0, i;
- if (parse_commit(the_repository, commit))
+ if (parse_commit(r, commit))
return ret;
for (i = 0; i < nr_reference; i++)
- if (parse_commit(the_repository, reference[i]))
+ if (parse_commit(r, reference[i]))
return ret;
- bases = paint_down_to_common(the_repository, commit, nr_reference,
reference);
+ bases = paint_down_to_common(r, commit, nr_reference, reference);
if (commit->object.flags & PARENT2)
ret = 1;
clear_commit_marks(commit, all_flags);
diff --git a/commit.h b/commit.h
index 0f3cdc6375..36412a5a9e 100644
--- a/commit.h
+++ b/commit.h
@@ -234,8 +234,7 @@ extern struct trace_key trace_shallow;
int is_descendant_of(struct commit *, struct commit_list *);
#define in_merge_bases(r, c1, c2) in_merge_bases_##r(c1, c2)
int in_merge_bases_the_repository(struct commit *, struct commit *);
-#define in_merge_bases_many(r, c, n, co) in_merge_bases_many_##r(c, n, co)
-int in_merge_bases_many_the_repository(struct commit *, int, struct commit **);
+int in_merge_bases_many(struct repository *r, struct commit *, int, struct
commit **);
extern int interactive_add(int argc, const char **argv, const char *prefix,
int patch);
extern int run_add_interactive(const char *revision, const char *patch_mode,
--
2.15.1.433.g936d1b9894.dirty
