author | Junio C Hamano <gitster@pobox.com> | |
Thu, 21 Feb 2008 00:13:32 +0000 (16:13 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 21 Feb 2008 00:13:32 +0000 (16:13 -0800) |
* js/maint-http-push:
http-push: avoid a needless goto
http-push: do not get confused by submodules
http-push: avoid invalid memory accesses
http-push: avoid a needless goto
http-push: do not get confused by submodules
http-push: avoid invalid memory accesses
http-push.c | patch | blob | history |
diff --git a/http-push.c b/http-push.c
index 63ff218b3c2a9d006ec95f20e7c1cd3a0808dffa..0beb7406c34a19403062a6a2e2aeeee35566a45f 100644 (file)
--- a/http-push.c
+++ b/http-push.c
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;
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);