diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-02-27 11:09:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-27 11:09:44 -0800 |
| commit | 28b01f4b5c335a27c9f4c6f2017bc0b485ffa324 (patch) | |
| tree | fa70b77d672322af5aeb3aef630be94b5ccff7cb | |
| parent | Don't use GIT_CONFIG in t5505-remote (diff) | |
| parent | http-push: avoid a needless goto (diff) | |
| download | tgif-28b01f4b5c335a27c9f4c6f2017bc0b485ffa324.tar.xz | |
Merge branch 'js/maint-http-push' into maint
* js/maint-http-push:
http-push: avoid a needless goto
http-push: do not get confused by submodules
http-push: avoid invalid memory accesses
| -rw-r--r-- | http-push.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/http-push.c b/http-push.c index b2b410df90..f9b77d6021 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; @@ -2398,15 +2405,17 @@ int main(int argc, char **argv) fill_active_slots(); add_fill_function(NULL, fill_active_slot); #endif - finish_all_active_slots(); + do { + finish_all_active_slots(); +#ifdef USE_CURL_MULTI + fill_active_slots(); +#endif + } while (request_queue_head && !aborted); /* Update the remote branch if all went well */ - if (aborted || !update_remote(ref->new_sha1, ref_lock)) { + if (aborted || !update_remote(ref->new_sha1, ref_lock)) rc = 1; - goto unlock; - } - unlock: if (!rc) fprintf(stderr, " done\n"); unlock_remote(ref_lock); |