Merge branch 'tm/line-log-first-parent'

gitster · gitster · commit 64b9326460e0 · 2014-11-06T10:52:37.000-08:00
"git log --first-parent -L..." used to crash.

* tm/line-log-first-parent:
  line-log: fix crash when --first-parent is used
diff --git 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));
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -94,4 +94,9 @@ test_expect_success '-L ,Y (Y == nlines + 2)' '`
`94`	`94`	`test_must_fail git log -L ,$n:b.c`
`95`	`95`	`'`
`96`	`96`
	`97`	`+test_expect_success '-L with --first-parent and a merge' '`
	`98`	`+ git checkout parallel-change &&`
	`99`	`+ git log --first-parent -L 1,1:b.c`
	`100`	`+'`
	`101`	`+`
`97`	`102`	`test_done`