commit-reach.c: allow get_merge_bases_many_0 to handle any repo

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/commit-reach.c b/commit-reach.c
index 81015830cb6a6400193c68e64b53f299d7291c44..b3b1f62abaa52306c272a67cd375d9b9a1e72b7c 100644 (file)
--- a/commit-reach.c
+++ b/commit-reach.c
@@ -216,7 +216,8 @@ static int remove_redundant(struct repository *r, struct commit **array, int cnt
        return filled;
 }
 
        return filled;
 }
 

-static struct commit_list *get_merge_bases_many_0(struct commit *one,
+static struct commit_list *get_merge_bases_many_0(struct repository *r,
+                                                 struct commit *one,

                                                  int n,
                                                  struct commit **twos,
                                                  int cleanup)
                                                  int n,
                                                  struct commit **twos,
                                                  int cleanup)


@@ -226,7 +227,7 @@ static struct commit_list *get_merge_bases_many_0(struct commit *one,
        struct commit_list *result;
        int cnt, i;
 
        struct commit_list *result;
        int cnt, i;
 

-       result = merge_bases_many(the_repository, one, n, twos);
+       result = merge_bases_many(r, one, n, twos);

        for (i = 0; i < n; i++) {
                if (one == twos[i])
                        return result;
        for (i = 0; i < n; i++) {
                if (one == twos[i])
                        return result;


@@ -249,7 +250,7 @@ static struct commit_list *get_merge_bases_many_0(struct commit *one,
        clear_commit_marks(one, all_flags);
        clear_commit_marks_many(n, twos, all_flags);
 
        clear_commit_marks(one, all_flags);
        clear_commit_marks_many(n, twos, all_flags);
 

-       cnt = remove_redundant(the_repository, rslt, cnt);
+       cnt = remove_redundant(r, rslt, cnt);

        result = NULL;
        for (i = 0; i < cnt; i++)
                commit_list_insert_by_date(rslt[i], &result);
        result = NULL;
        for (i = 0; i < cnt; i++)
                commit_list_insert_by_date(rslt[i], &result);


@@ -261,19 +262,19 @@ struct commit_list *get_merge_bases_many(struct commit *one,
                                         int n,
                                         struct commit **twos)
 {
                                         int n,
                                         struct commit **twos)
 {

-       return get_merge_bases_many_0(one, n, twos, 1);
+       return get_merge_bases_many_0(the_repository, one, n, twos, 1);

 }
 
 struct commit_list *get_merge_bases_many_dirty(struct commit *one,
                                               int n,
                                               struct commit **twos)
 {
 }
 
 struct commit_list *get_merge_bases_many_dirty(struct commit *one,
                                               int n,
                                               struct commit **twos)
 {

-       return get_merge_bases_many_0(one, n, twos, 0);
+       return get_merge_bases_many_0(the_repository, one, n, twos, 0);

 }
 
 struct commit_list *get_merge_bases(struct commit *one, struct commit *two)
 {
 }
 
 struct commit_list *get_merge_bases(struct commit *one, struct commit *two)
 {

-       return get_merge_bases_many_0(one, 1, &two, 1);
+       return get_merge_bases_many_0(the_repository, one, 1, &two, 1);

 }
 
 /*
 }
 
 /*