Skip to content

Commit

Permalink
fixup! repo_get_merge_bases_many_dirty(): pass on errors from `merge_…
Browse files Browse the repository at this point in the history
…bases_many()`
  • Loading branch information
dscho committed Feb 21, 2024
1 parent eda38eb commit 440f1e1
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion builtin/merge-base.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
struct commit_list *result = NULL, *r;

if (repo_get_merge_bases_many_dirty(the_repository, rev[0],
rev_nr - 1, rev + 1, &result) < 0)
rev_nr - 1, rev + 1, &result) < 0) {
free_commit_list(result);
return -1;
}

if (!result)
return 1;
Expand Down

0 comments on commit 440f1e1

Please sign in to comment.