summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-11 02:00:22 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-11 02:00:22 -0800
commitaff4e8dc217bdde9276e634ea7bf92adf926e573 (patch)
tree93d514e8710c5b0dfead1f13f14106b076eb82ad /revision.c
parent1b53a076fc3e3dc58e67971df18df0ce973a3ff9 (diff)
parent268c015495038be387ad3c5d674851889c497716 (diff)
downloadgit-aff4e8dc217bdde9276e634ea7bf92adf926e573.tar.gz
Merge branch 'maint'
* maint: revision traversal and pack: notice and die on missing commit
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 8603c14581..286e416b75 100644
--- a/revision.c
+++ b/revision.c
@@ -1738,14 +1738,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;
}