rebase: use reflog to find common base with upstream

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