Signed-off-by: Stefan Beller <sbel...@google.com>
---
commit.c | 4 ++--
commit.h | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/commit.c b/commit.c
index 8b1e35d2a1..33f5442dc1 100644
--- a/commit.c
+++ b/commit.c
@@ -1025,9 +1025,9 @@ struct commit_list *get_merge_bases_many_dirty(struct
commit *one,
return get_merge_bases_many_0(the_repository, one, n, twos, 0);
}
-struct commit_list *get_merge_bases_the_repository(struct commit *one, struct
commit *two)
+struct commit_list *get_merge_bases(struct repository *r, struct commit *one,
struct commit *two)
{
- return get_merge_bases_many_0(the_repository, one, 1, &two, 1);
+ return get_merge_bases_many_0(r, one, 1, &two, 1);
}
/*
diff --git a/commit.h b/commit.h
index e671ce68db..7fe6bb0b22 100644
--- a/commit.h
+++ b/commit.h
@@ -180,8 +180,7 @@ struct commit_graft *read_graft_line(struct strbuf *line);
int register_commit_graft(struct repository *r, struct commit_graft *, int);
struct commit_graft *lookup_commit_graft(struct repository *r, const struct
object_id *oid);
-#define get_merge_bases(r, r1, r2) get_merge_bases_##r(r1, r2)
-extern struct commit_list *get_merge_bases_the_repository(struct commit *rev1,
struct commit *rev2);
+extern struct commit_list *get_merge_bases(struct repository *r, struct commit
*rev1, struct commit *rev2);
extern struct commit_list *get_merge_bases_many(struct commit *one, int n,
struct commit **twos);
extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
--
2.15.1.433.g936d1b9894.dirty
