push: teach push to pass --verbose option to transport layer

A --verbose option to push should also be passed to the
transport layer, i.e. git-send-pack, git-http-push.

git push is modified to do so.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-push.c b/builtin-push.c
index 2c561953fc2d8cd8b02ab2a4c6fc470349c89bbb..6d1da07c46704f3de837044652f0a1fd149327ad 100644 (file)
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -115,6 +115,8 @@ int cmd_push(int argc, const char **argv, const char *prefix)
                flags |= TRANSPORT_PUSH_FORCE;
        if (dry_run)
                flags |= TRANSPORT_PUSH_DRY_RUN;
                flags |= TRANSPORT_PUSH_FORCE;
        if (dry_run)
                flags |= TRANSPORT_PUSH_DRY_RUN;

+       if (verbose)
+               flags |= TRANSPORT_PUSH_VERBOSE;

        if (tags)
                add_refspec("refs/tags/*");
        if (all)
        if (tags)
                add_refspec("refs/tags/*");
        if (all)

diff --git a/transport.c b/transport.c
index fa5cfbb09d18d4546725e947933b22bb32c3ec2c..e8a2608372de06ef3f77d9a450776e3095057c9f 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -386,7 +386,7 @@ static int curl_transport_push(struct transport *transport, int refspec_nr, cons
        int argc;
        int err;
 
        int argc;
        int err;
 

-       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)
        argv[0] = "http-push";
        argc = 1;
        if (flags & TRANSPORT_PUSH_ALL)


@@ -395,6 +395,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";
                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++;
        argv[argc++] = transport->url;
        while (refspec_nr--)
                argv[argc++] = *refspec++;


@@ -655,7 +657,7 @@ static int git_transport_push(struct transport *transport, int refspec_nr, const
        int argc;
        int err;
 
        int argc;
        int err;
 

-       argv = xmalloc((refspec_nr + 11) * sizeof(char *));
+       argv = xmalloc((refspec_nr + 12) * sizeof(char *));

        argv[0] = "send-pack";
        argc = 1;
        if (flags & TRANSPORT_PUSH_ALL)
        argv[0] = "send-pack";
        argc = 1;
        if (flags & TRANSPORT_PUSH_ALL)


@@ -664,6 +666,8 @@ static int git_transport_push(struct transport *transport, int refspec_nr, const
                argv[argc++] = "--force";
        if (flags & TRANSPORT_PUSH_DRY_RUN)
                argv[argc++] = "--dry-run";
                argv[argc++] = "--force";
        if (flags & TRANSPORT_PUSH_DRY_RUN)
                argv[argc++] = "--dry-run";

+       if (flags & TRANSPORT_PUSH_VERBOSE)
+               argv[argc++] = "--verbose";

        if (data->receivepack) {
                char *rp = xmalloc(strlen(data->receivepack) + 16);
                sprintf(rp, "--receive-pack=%s", data->receivepack);
        if (data->receivepack) {
                char *rp = xmalloc(strlen(data->receivepack) + 16);
                sprintf(rp, "--receive-pack=%s", data->receivepack);

diff --git a/transport.h b/transport.h
index df12ea74243cab68cc13eecf61106bba8ace1be4..2f80ab4b03df181dc8b041b1aace5832aa84deb1 100644 (file)
--- a/transport.h
+++ b/transport.h
@@ -30,6 +30,7 @@ struct transport {
 #define TRANSPORT_PUSH_ALL 1
 #define TRANSPORT_PUSH_FORCE 2
 #define TRANSPORT_PUSH_DRY_RUN 4
 #define TRANSPORT_PUSH_ALL 1
 #define TRANSPORT_PUSH_FORCE 2
 #define TRANSPORT_PUSH_DRY_RUN 4

+#define TRANSPORT_PUSH_VERBOSE 8

 
 /* Returns a transport suitable for the url */
 struct transport *transport_get(struct remote *, const char *);
 
 /* Returns a transport suitable for the url */
 struct transport *transport_get(struct remote *, const char *);