commit-reach(repo_get_merge_bases_many_dirty): pass on errors

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

diff --git a/commit-reach.h b/commit-reach.h
index 458043f4d58311af6aa5c5962aa8ef59617dd134..bf63cc468fd311a9ef658a23cec3db4fbbbac767 100644 (file)
--- a/commit-reach.h
+++ b/commit-reach.h
@@ -18,9 +18,10 @@ int repo_get_merge_bases_many(struct repository *r,
                              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);
 
 int get_octopus_merge_bases(struct commit_list *in, struct commit_list **result);