diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-08-27 20:03:35 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-08-27 20:03:35 -0700 |
commit | a1eb73d917e15cd97314e0a39cbe857329339a96 (patch) | |
tree | 731da0e1a6330782aa22c5dfda3543be1f99fefb /revision.c | |
parent | 262b04fa8dce84596738fd8c0dbff52994388efa (diff) | |
parent | afce435000030e3ad076ef1dd413e0fa314cdcbb (diff) | |
download | git-a1eb73d917e15cd97314e0a39cbe857329339a96.tar.gz git-a1eb73d917e15cd97314e0a39cbe857329339a96.tar.xz |
Merge branch 'maint-1.5.6' into maint-1.6.0
* 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
diff --git a/revision.c b/revision.c index 45fd7a366..94c210f5a 100644 --- a/revision.c +++ b/revision.c @@ -1538,14 +1538,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; } |