http-push: do not get confused by submodules

When encountering submodules in a tree, http-push should not try sending
the respective object.  Instead, it should ignore it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/http-push.c b/http-push.c
index 386b806f3ec62c183752e5ec5b19920fc9bd4cf0..14ef652ca76a6abab44e5f5e5b3265c3cdb34506 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -1634,12 +1634,19 @@ static struct object_list **process_tree(struct tree *tree,
 
        init_tree_desc(&desc, tree->buffer, tree->size);
 
 
        init_tree_desc(&desc, tree->buffer, tree->size);
 

-       while (tree_entry(&desc, &entry)) {
-               if (S_ISDIR(entry.mode))
+       while (tree_entry(&desc, &entry))
+               switch (object_type(entry.mode)) {
+               case OBJ_TREE:

                        p = process_tree(lookup_tree(entry.sha1), p, &me, name);
                        p = process_tree(lookup_tree(entry.sha1), p, &me, name);

-               else
+                       break;
+               case OBJ_BLOB:

                        p = process_blob(lookup_blob(entry.sha1), p, &me, name);
                        p = process_blob(lookup_blob(entry.sha1), p, &me, name);

-       }
+                       break;
+               default:
+                       /* Subproject commit - not in this repository */
+                       break;
+               }
+

        free(tree->buffer);
        tree->buffer = NULL;
        return p;
        free(tree->buffer);
        tree->buffer = NULL;
        return p;