X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=blobdiff_plain;f=commit.c;fp=commit.c;h=467be9f7f99408edbe1a34e2f21c491dd50e2813;hp=ef679a0b939046c4aac15567cdf3c0ae8c079d29;hb=531738052158fd66bc9b65534309f5c0a9d2808d;hpb=f87056ce403b5572683a45efe0e9021777831894 diff --git a/commit.c b/commit.c index ef679a0b93..467be9f7f9 100644 --- a/commit.c +++ b/commit.c @@ -1052,7 +1052,7 @@ struct commit *get_fork_point(const char *refname, struct commit *commit) { struct object_id oid; struct rev_collect revs; - struct commit_list *bases; + struct commit_list *bases = NULL; int i; struct commit *ret = NULL; char *full_refname; @@ -1077,8 +1077,9 @@ struct commit *get_fork_point(const char *refname, struct commit *commit) for (i = 0; i < revs.nr; i++) revs.commit[i]->object.flags &= ~TMP_MARK; - bases = repo_get_merge_bases_many(the_repository, commit, revs.nr, - revs.commit); + if (repo_get_merge_bases_many(the_repository, commit, revs.nr, + revs.commit, &bases) < 0) + exit(128); /* * There should be one and only one merge base, when we found