Merge branch 'maint-1.5.5' into maint-1.5.6

[git.git] / revision.c

diff --git a/revision.c b/revision.c
index a68abec3f203d751db3eb4bce9c8e958abf3cc9e..3861470389cc8f154c071500a0f4cd169f0fc10d 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -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;
                }