1 files changed, 5 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index 7c0189fb8f..52828edee0 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1523,7 +1523,11 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 	} else {
 		struct commit_list *list = remoteheads;
 		commit_list_insert(head_commit, &list);
-		common = get_octopus_merge_bases(list);
+		if (get_octopus_merge_bases(list, &common) < 0) {
+			free(list);
+			ret = 2;
+			goto done;
+		}
 		free(list);
 	}