summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-27 19:09:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-27 19:09:44 (GMT)
commit28b01f4b5c335a27c9f4c6f2017bc0b485ffa324 (patch)
treefa70b77d672322af5aeb3aef630be94b5ccff7cb
parent2ac8af1619feba08ec2285c0e305489a5cf815c9 (diff)
parent7fea9c551436a98edf4ab6840de981f99b7db687 (diff)
downloadgit-28b01f4b5c335a27c9f4c6f2017bc0b485ffa324.zip
git-28b01f4b5c335a27c9f4c6f2017bc0b485ffa324.tar.gz
git-28b01f4b5c335a27c9f4c6f2017bc0b485ffa324.tar.bz2
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.c27
1 files changed, 18 insertions, 9 deletions
diff --git a/http-push.c b/http-push.c
index b2b410d..f9b77d6 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);