From: Chase Brammer <cbrammer@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
git@vger.kernel.org, Tay Ray Chuan <rctay89@gmail.com>
Subject: Re: Push not writing to standard error
Date: Tue, 12 Oct 2010 14:37:50 -0600 [thread overview]
Message-ID: <AANLkTim_pjJ76J0ctSQO=eYsVtkZAgq2nhm0fskjjo+g@mail.gmail.com> (raw)
In-Reply-To: <20101012193830.GB8620@sigill.intra.peff.net>
Wow, I am amazed at how quick you churned that out. I haven't
participated in the git patch and release cycle, so forgive my
ignorance. Do you think that this will be released in the next
release (1.7.3.2) ? If so, any expectations on release date?
Chase
On Tue, Oct 12, 2010 at 1:38 PM, Jeff King <peff@peff.net> wrote:
>
> On Tue, Oct 12, 2010 at 03:32:04PM -0400, Jeff King wrote:
>
> > It looks like transport_set_verbosity gets called correctly, and then
> > sets the "progress" flag for the transport. But for the push side, I
> > don't see any transports actually looking at that flag. I think there
> > needs to be code in git_transport_push to handle the progress flag, and
> > it just isn't there.
>
> Here's a quick 5-minute patch. It works on my test case:
>
> rm -rf parent child
> git init parent &&
> git clone parent child &&
> cd child &&
> echo content >file && git add file && git commit -m one &&
> git push --progress origin master:foo >foo.out 2>&1 &&
> cat foo.out
>
> but I didn't even run the test suite. Maybe somebody more clueful in the
> area can pick it up?
>
> 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..fcf4707 100644
> --- a/send-pack.h
> +++ b/send-pack.h
> @@ -4,6 +4,7 @@
> struct send_pack_args {
> unsigned verbose:1,
> quiet:1,
> + progress:1,
> porcelain:1,
> send_mirror:1,
> force_update:1,
> 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);
>
next prev parent reply other threads:[~2010-10-12 20:38 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-12 19:04 Push not writing to standard error Chase Brammer
2010-10-12 19:21 ` Jonathan Nieder
2010-10-12 19:32 ` Jeff King
2010-10-12 19:38 ` Jeff King
2010-10-12 20:37 ` Chase Brammer [this message]
2010-10-12 20:48 ` Jeff King
2010-10-12 22:18 ` Chase Brammer
2010-10-13 17:33 ` Junio C Hamano
2010-10-13 17:45 ` Jeff King
2010-10-12 22:21 ` [PATCH] Fix to push --progress. The --progress flag was not being passed into tranport.c from send-pack.h, making the --progress flag unusable Chase Brammer
2010-10-12 22:44 ` Jonathan Nieder
2010-10-13 17:49 ` Junio C Hamano
2010-10-13 17:55 ` Jeff King
2010-10-13 18:40 ` Tay Ray Chuan
2010-10-13 19:31 ` [PATCH 0/3] fix push --progress over file://, git://, etc Tay Ray Chuan
2010-10-13 19:31 ` [PATCH 1/3] t5523-push-upstream: add function to ensure fresh upstream repo Tay Ray Chuan
2010-10-13 19:30 ` Jonathan Nieder
2010-10-13 19:31 ` [PATCH 2/3] t5523-push-upstream: test progress messages Tay Ray Chuan
2010-10-13 19:31 ` [PATCH 3/3] push: pass --progress down to git-pack-objects Tay Ray Chuan
2010-10-14 0:59 ` Tay Ray Chuan
2010-10-14 1:24 ` Jeff King
2010-10-13 19:35 ` [PATCH 0/3] fix push --progress over file://, git://, etc Tay Ray Chuan
2010-10-16 18:36 ` [PATCH v2 0/8] " Tay Ray Chuan
2010-10-16 18:36 ` [PATCH v2 1/8] tests: factor out terminal handling from t7006 Tay Ray Chuan
2010-10-16 18:36 ` [PATCH v2 2/8] tests: test terminal output to both stdout and stderr Tay Ray Chuan
2010-10-16 18:36 ` [PATCH v2 3/8] test-lib: allow test code to check the list of declared prerequisites Tay Ray Chuan
2010-10-16 18:36 ` [PATCH v2 4/8] test_terminal: catch use without TTY prerequisite Tay Ray Chuan
2010-10-16 18:37 ` [PATCH v2 5/8] test_terminal: give priority to test-terminal.perl usage Tay Ray Chuan
2010-10-16 18:37 ` [PATCH v2 6/8] t5523-push-upstream: add function to ensure fresh upstream repo Tay Ray Chuan
2010-10-16 18:37 ` [PATCH v2 7/8] t5523-push-upstream: test progress messages Tay Ray Chuan
2010-10-16 18:37 ` [PATCH v2 8/8] push: pass --progress down to git-pack-objects Tay Ray Chuan
2010-10-17 0:46 ` [PATCH v2 7/8] t5523-push-upstream: test progress messages Jonathan Nieder
2010-10-17 0:38 ` [PATCH v2 5/8] test_terminal: give priority to test-terminal.perl usage Jonathan Nieder
2010-10-22 19:42 ` Jeff King
2010-10-17 0:51 ` [PATCH v2 0/8] fix push --progress over file://, git://, etc Jonathan Nieder
2010-10-14 3:02 ` [PATCH 0/3] more push progress tests Jeff King
2010-10-14 3:04 ` [PATCH 1/3] tests: factor out terminal handling from t7006 Jeff King
2010-10-14 3:10 ` Jonathan Nieder
2010-10-14 3:04 ` [PATCH 2/3] tests: test terminal output to both stdout and stderr Jeff King
2010-10-14 3:27 ` Jonathan Nieder
2010-10-14 3:05 ` [PATCH 3/3] t5523: test push progress output to tty Jeff King
2010-10-14 3:16 ` Jonathan Nieder
2010-10-14 3:34 ` Jeff King
2010-10-14 20:37 ` [PATCH/RFC 0/2] test_terminal: check that TTY prerequisite is declared Jonathan Nieder
2010-10-14 20:40 ` [PATCH 1/2] test-lib: allow test code to check the list of declared prerequisites Jonathan Nieder
2010-10-15 5:18 ` Ævar Arnfjörð Bjarmason
2010-10-15 5:34 ` Jonathan Nieder
2010-10-14 20:41 ` [PATCH 2/2] test_terminal: catch use without TTY prerequisite Jonathan Nieder
2010-10-15 4:42 ` [PATCH/RFC 0/2] test_terminal: check that TTY prerequisite is declared Jeff King
2010-10-15 11:27 ` Tay Ray Chuan
2010-10-18 16:39 ` Push not writing to standard error Scott R. Godin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='AANLkTim_pjJ76J0ctSQO=eYsVtkZAgq2nhm0fskjjo+g@mail.gmail.com' \
--to=cbrammer@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=rctay89@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).