undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
"git log --first-parent -L..." used to crash.

* tm/line-log-first-parent:
  line-log: fix crash when --first-parent is used
This commit is contained in:
Junio C Hamano 2014-11-06 10:52:36 -08:00
commit 64b9326460
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
line-log.c
View File

@ -1141,6 +1141,9 @@ static int process_ranges_merge_commit(struct rev_info *rev, struct commit *comm
int i; int i;
int nparents = commit_list_count(commit->parents); int nparents = commit_list_count(commit->parents);
if (nparents > 1 && rev->first_parent_only)
nparents = 1;
diffqueues = xmalloc(nparents * sizeof(*diffqueues)); diffqueues = xmalloc(nparents * sizeof(*diffqueues));
cand = xmalloc(nparents * sizeof(*cand)); cand = xmalloc(nparents * sizeof(*cand));
parents = xmalloc(nparents * sizeof(*parents)); parents = xmalloc(nparents * sizeof(*parents));

5
t/t4211-line-log.sh
View File

@ -94,4 +94,9 @@ test_expect_success '-L ,Y (Y == nlines + 2)' '
test_must_fail git log -L ,$n:b.c 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 test_done