Merge branch 'maint-1.5.5' into maint-1.5.6
* maint-1.5.5: revision traversal and pack: notice and die on missing commit Conflicts: revision.c
This commit is contained in:
@ -1599,14 +1599,16 @@ static struct commit *get_revision_1(struct rev_info *revs)
|
||||
(commit->date < revs->max_age))
|
||||
continue;
|
||||
if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0)
|
||||
return NULL;
|
||||
die("Failed to traverse parents of commit %s",
|
||||
sha1_to_hex(commit->object.sha1));
|
||||
}
|
||||
|
||||
switch (simplify_commit(revs, commit)) {
|
||||
case commit_ignore:
|
||||
continue;
|
||||
case commit_error:
|
||||
return NULL;
|
||||
die("Failed to simplify parents of commit %s",
|
||||
sha1_to_hex(commit->object.sha1));
|
||||
default:
|
||||
return commit;
|
||||
}
|
||||
|
Reference in New Issue
Block a user