summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-11 01:41:22 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-11 01:41:22 -0800
commitafce435000030e3ad076ef1dd413e0fa314cdcbb (patch)
tree3d8c1efc4ad599e237dbc41cc25f6f47442bf150 /revision.c
parent8a124b82a03240b10c83085559e5988bc92ea7e2 (diff)
parent92798702cf6d201f80e257a07d0a0c40565c79fe (diff)
downloadgit-afce435000030e3ad076ef1dd413e0fa314cdcbb.tar.gz
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
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/revision.c b/revision.c
index a68abec3f2..3861470389 100644
--- 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;
}