From 1bbeb4c6905b18446485413d98f4b75e56a6830c Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 14 Feb 2008 23:32:32 +0000 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- http-push.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/http-push.c b/http-push.c index 386b806f3e..14ef652ca7 100644 --- 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); - 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); - else + break; + case OBJ_BLOB: 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; -- 2.11.4.GIT