diff options
Diffstat (limited to 'src')
| -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; } } |