Merge branch 'aw/mirror-push' into jk/send-pack

diff --git a/transport.c b/transport.c
index fad97d7cb289e357c9baa637439474449d0f8998..8d9bdbe8dedd1c050e017d509cbc9e87d98a6e88 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -393,7 +393,7 @@ static int curl_transport_push(struct transport *transport, int refspec_nr, cons
        if (flags & TRANSPORT_PUSH_MIRROR)
                return error("http transport does not support mirror mode");
 
-       argv = xmalloc((refspec_nr + 11) * sizeof(char *));
+       argv = xmalloc((refspec_nr + 12) * sizeof(char *));
        argv[0] = "http-push";
        argc = 1;
        if (flags & TRANSPORT_PUSH_ALL)
@@ -402,6 +402,8 @@ static int curl_transport_push(struct transport *transport, int refspec_nr, cons
                argv[argc++] = "--force";
        if (flags & TRANSPORT_PUSH_DRY_RUN)
                argv[argc++] = "--dry-run";
+       if (flags & TRANSPORT_PUSH_VERBOSE)
+               argv[argc++] = "--verbose";
        argv[argc++] = transport->url;
        while (refspec_nr--)
                argv[argc++] = *refspec++;
@@ -664,7 +666,7 @@ static int git_transport_push(struct transport *transport, int refspec_nr, const
        args.send_mirror = !!(flags & TRANSPORT_PUSH_MIRROR);
        args.force_update = !!(flags & TRANSPORT_PUSH_FORCE);
        args.use_thin_pack = data->thin;
-       args.verbose = transport->verbose;
+       args.verbose = !!(flags & TRANSPORT_PUSH_VERBOSE);
        args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN);
 
        return send_pack(&args, transport->url, transport->remote, refspec_nr, refspec);