From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Feb 2009 09:41:22 +0000 (-0800)
Subject: Merge branch 'maint-1.5.5' into maint-1.5.6
X-Git-Tag: v1.6.2-rc1~24^2~2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=afce435000030e3ad076ef1dd413e0fa314cdcbb;p=git.git

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
---

afce435000030e3ad076ef1dd413e0fa314cdcbb
diff --cc revision.c
index a68abec3f,07e5fcd86..386147038
--- a/revision.c
+++ b/revision.c
@@@ -1598,8 -1560,9 +1598,9 @@@ static struct commit *get_revision_1(st
  			if (revs->max_age != -1 &&
  			    (commit->date < revs->max_age))
  				continue;
 -			if (add_parents_to_list(revs, commit, &revs->commits) < 0)
 +			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)) {