fixup! get_octopus_merge_bases(): pass on errors from `merge_bases_ma…

…ny()`
dscho · Feb 21, 2024 · eda38eb · eda38eb
1 parent fa64625
commit eda38eb
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/builtin/merge-base.c b/builtin/merge-base.c
@@ -84,8 +84,11 @@ static int handle_octopus(int count, const char **args, int show_all)
 	for (i = count - 1; i >= 0; i--)
 		commit_list_insert(get_commit_reference(args[i]), &revs);
 
-	if (get_octopus_merge_bases(revs, &result) < 0)
+	if (get_octopus_merge_bases(revs, &result) < 0) {
+		free_commit_list(revs);
+		free_commit_list(result);
 		return 128;
+	}
 	free_commit_list(revs);
 	reduce_heads_replace(&result);