Merge branch 'maint-1.5.4' into maint-1.5.5

diff --git a/revision.c b/revision.c
index ffbed3fbf22c22b8862c49bdddd10cab201f86a2..07e5fcd86cfe6292bc21bbf0d6cc786e81ae02cc 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1561,14 +1561,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) < 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;
                }