diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-02-11 10:00:07 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-02-11 10:00:07 (GMT) |
commit | 268c015495038be387ad3c5d674851889c497716 (patch) | |
tree | e3fea22b9246026b95ceb988deb4cc073659aa12 /revision.c | |
parent | 9b27ea95189b1f276c9f7e10df81fa1476a4ad4d (diff) | |
parent | afce435000030e3ad076ef1dd413e0fa314cdcbb (diff) | |
download | git-268c015495038be387ad3c5d674851889c497716.zip git-268c015495038be387ad3c5d674851889c497716.tar.gz git-268c015495038be387ad3c5d674851889c497716.tar.bz2 |
Merge branch 'maint-1.5.6' into maint
* maint-1.5.6:
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
@@ -1734,14 +1734,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; } |