Merge git://repo.or.cz/git-gui

[thirdparty/git.git] / upload-pack.c

diff --git a/upload-pack.c b/upload-pack.c
index 43342ac161952f5c03c7b737231c4c664b7513a7..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,
@@ -753,7 +752,6 @@ static void upload_pack(void)
        struct string_list symref = STRING_LIST_INIT_DUP;
 
        head_ref_namespaced(find_symref, &symref);
-       for_each_namespaced_ref(find_symref, &symref);
 
        if (advertise_refs || !stateless_rpc) {
                reset_timeout();