[PATCH 3/3] push: pass --progress down to git-pack-objects
- From
Tay Ray Chuan <rctay89@gmail.com>
- Date
- Oct 13, 2010, 19:31 UTC
- Message-ID
- <1286998311-5112-4-git-send-email-rctay89@gmail.com>
- In-Reply-To
- <1286998311-5112-3-git-send-email-rctay89@gmail.com>
From: Jeff King <peff@peff.net>
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: Tay Ray Chuan <rctay89@gmail.com> --- builtin/send-pack.c | 3 +++ send-pack.h | 1 + t/t5523-push-upstream.sh | 4 ++-- transport.c | 1 + 4 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 481602d..efd9be6 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 60b4ba6..05d7ab1 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 554f55e..113626b 100755 --- a/t/t5523-push-upstream.sh +++ b/t/t5523-push-upstream.sh @@ -72,7 +72,7 @@ test_expect_success 'push -u HEAD' ' check_config headbranch upstream refs/heads/headbranch ' -test_expect_failure 'progress messages to non-tty' ' +test_expect_success 'progress messages to non-tty' ' ensure_fresh_upstream && # skip progress messages, since stderr is non-tty @@ -80,7 +80,7 @@ test_expect_failure 'progress messages to non-tty' ' ! grep "Writing objects" err ' -test_expect_failure 'progress messages to non-tty (forced)' ' +test_expect_success 'progress messages 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 4dba6f8..0078660 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);
-- 1.7.2.2.513.ge1ef3