diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-02-11 01:40:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-11 01:40:12 -0800 |
| commit | 92798702cf6d201f80e257a07d0a0c40565c79fe (patch) | |
| tree | dd283f28f9f630b5c5ff76456cb46368ebbacc2e /revision.c | |
| parent | GIT 1.5.5.6 (diff) | |
| parent | revision traversal and pack: notice and die on missing commit (diff) | |
| download | tgif-92798702cf6d201f80e257a07d0a0c40565c79fe.tar.xz | |
Merge branch 'maint-1.5.4' into maint-1.5.5
* maint-1.5.4:
revision traversal and pack: notice and die on missing commit
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/revision.c b/revision.c index ffbed3fbf2..07e5fcd86c 100644 --- 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; } |