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>
Steffen Prohaska committed
Nov 11, 2007 at 15:01 UTC
1b2486d73789aaed0671e8d5cc60f5624d8e7ce5
3 files changed
+9
-2
builtin-push.c
+2
@@ -115,6 +115,8 @@ int cmd_push(int argc, const char **argv, const char *prefix)
115
flags |= TRANSPORT_PUSH_FORCE;
116
if (dry_run)
117
flags |= TRANSPORT_PUSH_DRY_RUN;
118
+ if (verbose)
119
+ flags |= TRANSPORT_PUSH_VERBOSE;
120
if (tags)
121
add_refspec("refs/tags/*");
122
if (all)
transport.c
+6
-2
@@ -386,7 +386,7 @@ static int curl_transport_push(struct transport *transport, int refspec_nr, cons
386
int argc;
387
int err;
388
389
- argv = xmalloc((refspec_nr + 11) * sizeof(char *));
389
+ argv = xmalloc((refspec_nr + 12) * sizeof(char *));
390
argv[0] = "http-push";
391
argc = 1;
392
if (flags & TRANSPORT_PUSH_ALL)
@@ -395,6 +395,8 @@ static int curl_transport_push(struct transport *transport, int refspec_nr, cons
395
argv[argc++] = "--force";
396
if (flags & TRANSPORT_PUSH_DRY_RUN)
397
argv[argc++] = "--dry-run";
398
+ if (flags & TRANSPORT_PUSH_VERBOSE)
399
+ argv[argc++] = "--verbose";
400
argv[argc++] = transport->url;
401
while (refspec_nr--)
402
argv[argc++] = *refspec++;
@@ -655,7 +657,7 @@ static int git_transport_push(struct transport *transport, int refspec_nr, const
657
int argc;
658
int err;
659
658
- argv = xmalloc((refspec_nr + 11) * sizeof(char *));
660
+ argv = xmalloc((refspec_nr + 12) * sizeof(char *));
661
argv[0] = "send-pack";
662
argc = 1;
663
if (flags & TRANSPORT_PUSH_ALL)
@@ -664,6 +666,8 @@ static int git_transport_push(struct transport *transport, int refspec_nr, const
666
argv[argc++] = "--force";
667
if (flags & TRANSPORT_PUSH_DRY_RUN)
668
argv[argc++] = "--dry-run";
669
+ if (flags & TRANSPORT_PUSH_VERBOSE)
670
+ argv[argc++] = "--verbose";
671
if (data->receivepack) {
672
char *rp = xmalloc(strlen(data->receivepack) + 16);
673
sprintf(rp, "--receive-pack=%s", data->receivepack);
transport.h
+1
@@ -30,6 +30,7 @@ struct transport {
30
#define TRANSPORT_PUSH_ALL 1
31
#define TRANSPORT_PUSH_FORCE 2
32
#define TRANSPORT_PUSH_DRY_RUN 4
33
+#define TRANSPORT_PUSH_VERBOSE 8
34
35
/* Returns a transport suitable for the url */
36
struct transport *transport_get(struct remote *, const char *);