mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Steffen Prohaska 2007-11-11 15:01:44 +01:00 committed by Junio C Hamano
parent 05ee917a6e
commit 1b2486d737
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-push.c
View File

@ -115,6 +115,8 @@ int cmd_push(int argc, const char **argv, const char *prefix)
flags |= TRANSPORT_PUSH_FORCE; flags |= TRANSPORT_PUSH_FORCE;
if (dry_run) if (dry_run)
flags |= TRANSPORT_PUSH_DRY_RUN; flags |= TRANSPORT_PUSH_DRY_RUN;
if (verbose)
flags |= TRANSPORT_PUSH_VERBOSE;
if (tags) if (tags)
add_refspec("refs/tags/*"); add_refspec("refs/tags/*");
if (all) if (all)

8
transport.c
View File

@ -386,7 +386,7 @@ static int curl_transport_push(struct transport *transport, int refspec_nr, cons
int argc; int argc;
int err; int err;
argv = xmalloc((refspec_nr + 11) * sizeof(char *)); argv = xmalloc((refspec_nr + 12) * sizeof(char *));
argv[0] = "http-push"; argv[0] = "http-push";
argc = 1; argc = 1;
if (flags & TRANSPORT_PUSH_ALL) if (flags & TRANSPORT_PUSH_ALL)
@ -395,6 +395,8 @@ static int curl_transport_push(struct transport *transport, int refspec_nr, cons
argv[argc++] = "--force"; argv[argc++] = "--force";
if (flags & TRANSPORT_PUSH_DRY_RUN) if (flags & TRANSPORT_PUSH_DRY_RUN)
argv[argc++] = "--dry-run"; argv[argc++] = "--dry-run";
if (flags & TRANSPORT_PUSH_VERBOSE)
argv[argc++] = "--verbose";
argv[argc++] = transport->url; argv[argc++] = transport->url;
while (refspec_nr--) while (refspec_nr--)
argv[argc++] = *refspec++; argv[argc++] = *refspec++;
@ -655,7 +657,7 @@ static int git_transport_push(struct transport *transport, int refspec_nr, const
int argc; int argc;
int err; int err;
argv = xmalloc((refspec_nr + 11) * sizeof(char *)); argv = xmalloc((refspec_nr + 12) * sizeof(char *));
argv[0] = "send-pack"; argv[0] = "send-pack";
argc = 1; argc = 1;
if (flags & TRANSPORT_PUSH_ALL) if (flags & TRANSPORT_PUSH_ALL)
@ -664,6 +666,8 @@ static int git_transport_push(struct transport *transport, int refspec_nr, const
argv[argc++] = "--force"; argv[argc++] = "--force";
if (flags & TRANSPORT_PUSH_DRY_RUN) if (flags & TRANSPORT_PUSH_DRY_RUN)
argv[argc++] = "--dry-run"; argv[argc++] = "--dry-run";
if (flags & TRANSPORT_PUSH_VERBOSE)
argv[argc++] = "--verbose";
if (data->receivepack) { if (data->receivepack) {
char *rp = xmalloc(strlen(data->receivepack) + 16); char *rp = xmalloc(strlen(data->receivepack) + 16);
sprintf(rp, "--receive-pack=%s", data->receivepack); sprintf(rp, "--receive-pack=%s", data->receivepack);

1
transport.h
View File

@ -30,6 +30,7 @@ struct transport {
#define TRANSPORT_PUSH_ALL 1 #define TRANSPORT_PUSH_ALL 1
#define TRANSPORT_PUSH_FORCE 2 #define TRANSPORT_PUSH_FORCE 2
#define TRANSPORT_PUSH_DRY_RUN 4 #define TRANSPORT_PUSH_DRY_RUN 4
#define TRANSPORT_PUSH_VERBOSE 8
/* Returns a transport suitable for the url */ /* Returns a transport suitable for the url */
struct transport *transport_get(struct remote *, const char *); struct transport *transport_get(struct remote *, const char *);