diff options
| author | Jeff King <peff@peff.net> | 2010-10-16 22:37:03 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-19 03:20:19 +0400 |
| commit | d7c411b71d727600d2f031fec9723873ae93c1c7 (patch) | |
| tree | cef120584580323d54a0e24d0006bf8f4df22a95 | |
| parent | 8ac3ed27d4ca6b3c89c51e4d90e2e7be5de5ab15 (diff) | |
push: pass --progress down to git-pack-objects
When pushing via builtin transports (like file://, git://), the
underlying transport helper (in this case, git-pack-objects) did not get
the --progress option, even if it was passed to git push.
Fix this, and update the tests to reflect this.
Note that according to the git-pack-objects documentation, we can safely
apply the usual --progress semantics for the transport commands like
clone and fetch (and for pushing over other smart transports).
Reported-by: Chase Brammer <cbrammer@gmail.com>
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/send-pack.c | 3 | ||||
| -rw-r--r-- | send-pack.h | 1 | ||||
| -rwxr-xr-x | t/t5523-push-upstream.sh | 4 | ||||
| -rw-r--r-- | transport.c | 1 |
4 files changed, 7 insertions, 2 deletions
diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 481602d8ae..efd9be67bd 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -48,6 +48,7 @@ static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *ext NULL, NULL, NULL, + NULL, }; struct child_process po; int i; @@ -59,6 +60,8 @@ static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *ext argv[i++] = "--delta-base-offset"; if (args->quiet) argv[i++] = "-q"; + if (args->progress) + argv[i++] = "--progress"; memset(&po, 0, sizeof(po)); po.argv = argv; po.in = -1; diff --git a/send-pack.h b/send-pack.h index 60b4ba66eb..05d7ab118b 100644 --- a/send-pack.h +++ b/send-pack.h @@ -5,6 +5,7 @@ struct send_pack_args { unsigned verbose:1, quiet:1, porcelain:1, + progress:1, send_mirror:1, force_update:1, use_thin_pack:1, diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh index f43d76063e..c229fe68f1 100755 --- a/t/t5523-push-upstream.sh +++ b/t/t5523-push-upstream.sh @@ -78,7 +78,7 @@ test_expect_success TTY 'progress messages go to tty' ' grep "Writing objects" err ' -test_expect_failure 'progress messages do not go to non-tty' ' +test_expect_success 'progress messages do not go to non-tty' ' ensure_fresh_upstream && # skip progress messages, since stderr is non-tty @@ -86,7 +86,7 @@ test_expect_failure 'progress messages do not go to non-tty' ' ! grep "Writing objects" err ' -test_expect_failure 'progress messages go to non-tty (forced)' ' +test_expect_success 'progress messages go to non-tty (forced)' ' ensure_fresh_upstream && # force progress messages to stderr, even though it is non-tty diff --git a/transport.c b/transport.c index 4dba6f8815..0078660611 100644 --- a/transport.c +++ b/transport.c @@ -789,6 +789,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re args.use_thin_pack = data->options.thin; args.verbose = (transport->verbose > 0); args.quiet = (transport->verbose < 0); + args.progress = transport->progress; args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN); args.porcelain = !!(flags & TRANSPORT_PUSH_PORCELAIN); |