aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTzvetan Mikov <tmikov@gmail.com>2014-11-04 12:33:37 -0800
committerJunio C Hamano <gitster@pobox.com>2014-11-04 12:47:35 -0800
commita8787c5c1c51f4bdb610526175442a23eea7c467 (patch)
tree3a00579a034a4231109d36ecdfc6432742d22327
parent1762224ddb599ab14ca26cedafec39dee9b92fe5 (diff)
downloadgit-a8787c5c1c51f4bdb610526175442a23eea7c467.tar.gz
git-a8787c5c1c51f4bdb610526175442a23eea7c467.tar.xz
line-log: fix crash when --first-parent is used
line-log tries to access all parents of a commit, but only the first parent has been loaded if "--first-parent" is specified, resulting in a crash. Limit the number of parents to one if "--first-parent" is specified. Reported-by: Eric N. Vander Weele <ericvw@gmail.com> Signed-off-by: Tzvetan Mikov <tmikov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--line-log.c3
-rwxr-xr-xt/t4211-line-log.sh5
2 files changed, 8 insertions, 0 deletions
diff --git a/line-log.c b/line-log.c
index c2d01dccc..fe04c9d10 100644
--- a/line-log.c
+++ b/line-log.c
@@ -1164,6 +1164,9 @@ static int process_ranges_merge_commit(struct rev_info *rev, struct commit *comm
int i;
int nparents = count_parents(commit);
+ 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
index 7665d6785..3be25a3a7 100755
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -77,4 +77,9 @@ test_expect_success '-L {empty-range} (first -L)' '
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