Start the 2.46 cycle

[thirdparty/git.git] / commit-reach.h

diff --git a/commit-reach.h b/commit-reach.h
index 2c6fcdd34f6774e7e86b302311838fc9158e77f6..bf63cc468fd311a9ef658a23cec3db4fbbbac767 100644 (file)
--- a/commit-reach.h
+++ b/commit-reach.h
@@ -13,15 +13,17 @@ int repo_get_merge_bases(struct repository *r,
                         struct commit *rev1,
                         struct commit *rev2,
                         struct commit_list **result);
-struct commit_list *repo_get_merge_bases_many(struct repository *r,
-                                             struct commit *one, int n,
-                                             struct commit **twos);
+int repo_get_merge_bases_many(struct repository *r,
+                             struct commit *one, int n,
+                             struct commit **twos,
+                             struct commit_list **result);
 /* To be used only when object flags after this call no longer matter */
-struct commit_list *repo_get_merge_bases_many_dirty(struct repository *r,
-                                                   struct commit *one, int n,
-                                                   struct commit **twos);
+int repo_get_merge_bases_many_dirty(struct repository *r,
+                                   struct commit *one, int n,
+                                   struct commit **twos,
+                                   struct commit_list **result);
 
-struct commit_list *get_octopus_merge_bases(struct commit_list *in);
+int get_octopus_merge_bases(struct commit_list *in, struct commit_list **result);
 
 int repo_is_descendant_of(struct repository *r,
                          struct commit *commit,