Skip to content

Commit

Permalink
Merge branch 'tm/line-log-first-parent'
Browse files Browse the repository at this point in the history
"git log --first-parent -L..." used to crash.

* tm/line-log-first-parent:
  line-log: fix crash when --first-parent is used
  • Loading branch information
Junio C Hamano committed Nov 6, 2014
2 parents a1671dd + a8787c5 commit 64b9326
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
3 changes: 3 additions & 0 deletions line-log.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
5 changes: 5 additions & 0 deletions t/t4211-line-log.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,9 @@ test_expect_success '-L ,Y (Y == nlines + 2)' '
test_must_fail git log -L ,$n:b.c
'

test_expect_success '-L with --first-parent and a merge' '
git checkout parallel-change &&
git log --first-parent -L 1,1:b.c
'

test_done

0 comments on commit 64b9326

Please sign in to comment.