|
|
|
@ -216,7 +216,8 @@ static int remove_redundant(struct repository *r, struct commit **array, int cnt
@@ -216,7 +216,8 @@ static int remove_redundant(struct repository *r, struct commit **array, int cnt
|
|
|
|
|
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) |
|
|
|
@ -226,7 +227,7 @@ static struct commit_list *get_merge_bases_many_0(struct commit *one,
@@ -226,7 +227,7 @@ static struct commit_list *get_merge_bases_many_0(struct commit *one,
|
|
|
|
|
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; |
|
|
|
@ -249,7 +250,7 @@ static struct commit_list *get_merge_bases_many_0(struct commit *one,
@@ -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); |
|
|
|
|
|
|
|
|
|
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); |
|
|
|
@ -261,19 +262,19 @@ struct commit_list *get_merge_bases_many(struct commit *one,
@@ -261,19 +262,19 @@ struct commit_list *get_merge_bases_many(struct commit *one,
|
|
|
|
|
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) |
|
|
|
|
{ |
|
|
|
|
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) |
|
|
|
|
{ |
|
|
|
|
return get_merge_bases_many_0(one, 1, &two, 1); |
|
|
|
|
return get_merge_bases_many_0(the_repository, one, 1, &two, 1); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/* |
|
|
|
|