global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-19 05:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'by/line-log' into next

Browse Source 
* by/line-log:
  log -L: do not free parents lists we might need again
This commit is contained in:
Junio C Hamano
2010-09-12 14:03:58 -07:00
parent 6997c03281 09457d2867
commit e29a02951d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
line.c
View File

@@ -961,8 +961,10 @@ static int assign_range_to_parent(struct rev_info *rev, struct commit *c,
* If there is no new ranges assigned to the parent,
* we should mark it as a 'root' commit.
*/
free(c->parents);
c->parents = NULL;
if (c->parents && !c->parents->next) {
free(c->parents);
c->parents = NULL;
}
}
/* and the ranges of current commit c is updated */