commit-reach(repo_get_merge_bases): pass on "missing commits" errors

[thirdparty/git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index ae23a6204849a08d260f179286cf83fee1352315..32e9d6665debefd667324abd18f2ba0e9289f2d6 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3633,7 +3633,9 @@ static int merge_recursive_internal(struct merge_options *opt,
        }
 
        if (!merge_bases) {
-               merge_bases = repo_get_merge_bases(the_repository, h1, h2);
+               if (repo_get_merge_bases(the_repository, h1, h2,
+                                        &merge_bases) < 0)
+                       return -1;
                merge_bases = reverse_commit_list(merge_bases);
        }