merge-base: Do not read parents from the root

vmg · vmg · commit 4cacf5b59452 · 2015-11-02T13:47:04.000+01:00
diff --git 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;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ static void clear_commit_marks_1(git_commit_list **plist,`
`318`	`318`	`git_commit_list_insert(p, plist);`
`319`	`319`	`}`
`320`	`320`
`321`		`- commit = commit->parents[0];`
	`321`	`+ commit = commit->out_degree ? commit->parents[0] : NULL;`
`322`	`322`	`}`
`323`	`323`	`}`
`324`	`324`