diff options
Diffstat (limited to 'line-log.c')
| -rw-r--r-- | line-log.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/line-log.c b/line-log.c index 038c58a395..b7864ad586 100644 --- a/line-log.c +++ b/line-log.c @@ -1141,6 +1141,9 @@ static int process_ranges_merge_commit(struct rev_info *rev, struct commit *comm int i; int nparents = commit_list_count(commit->parents); + if (nparents > 1 && rev->first_parent_only) + nparents = 1; + diffqueues = xmalloc(nparents * sizeof(*diffqueues)); cand = xmalloc(nparents * sizeof(*cand)); parents = xmalloc(nparents * sizeof(*parents)); |