From 4cacf5b59452caac3226a113135c476815a85617 Mon Sep 17 00:00:00 2001
From: Vicent Marti <tanoku@gmail.com>
Date: Fri, 30 Oct 2015 11:50:43 +0100
Subject: [PATCH] merge-base: Do not read parents from the root

---
 src/merge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/merge.c b/src/merge.c
index 0c132c4a3..44904ca04 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -318,7 +318,7 @@ static void clear_commit_marks_1(git_commit_list **plist,
 			git_commit_list_insert(p, plist);
 		}
 
-		commit = commit->parents[0];
+		commit = commit->out_degree ? commit->parents[0] : NULL;
 	}
 }