Merge branch 'jk/help-alias'

diff --git a/upload-pack.c b/upload-pack.c
index de147853b5546f90190654844c765b0ea44902af..b26d05331d7eeab4efea01594ecf196bc5fb50ed 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -534,7 +534,8 @@ static void receive_needs(void)
                                /* make sure the real parents are parsed */
                                unregister_shallow(object->sha1);
                                object->parsed = 0;
-                               parse_commit((struct commit *)object);
+                               if (parse_commit((struct commit *)object))
+                                       die("invalid commit");
                                parents = ((struct commit *)object)->parents;
                                while (parents) {
                                        add_object_array(&parents->item->object,