diff options
| author | Vicent Marti <tanoku@gmail.com> | 2015-10-30 11:50:43 +0100 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2015-11-02 13:47:04 +0100 |
| commit | 4cacf5b59452caac3226a113135c476815a85617 (patch) | |
| tree | 194de1906ddacf099cbf71c5ea18fe239d3b1c5c | |
| parent | 136a71f4eee60052cd1b55ba7c9b600871baf6d4 (diff) | |
| download | libgit2-4cacf5b59452caac3226a113135c476815a85617.tar.gz | |
merge-base: Do not read parents from the root
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } } |