From: Jeff King <peff@peff.net>
To: Clemens Buchacher <drizzd@aon.at>
Cc: Junio C Hamano <gitster@pobox.com>, dfowler <davidfowl@gmail.com>,
git@vger.kernel.org, msysgit@googlegroups.com,
Paul Betts <paul@github.com>, David Ebbo <david.ebbo@gmail.com>
Subject: [PATCH 1/3] send-pack: show progress when isatty(2)
Date: Tue, 1 May 2012 04:41:42 -0400 [thread overview]
Message-ID: <20120501084139.GA4998@sigill.intra.peff.net> (raw)
In-Reply-To: <20120501084048.GA21904@sigill.intra.peff.net>
The send_pack_args struct has two verbosity flags: "quiet"
and "progress". Originally, if "quiet" was set, we would
tell pack-objects explicitly to be quiet, and if "progress"
was set, we would tell it to show progress. Otherwise, we
told it neither, and it relied on isatty(2) to make the
decision itself.
However, commit 01fdc21 changed the meaning of these
variables. Now both "quiet" and "!progress" instruct us to
tell pack-objects to be quiet (and a non-zero "progress"
means the same as before). This works well for transports
which call send_pack directly, as the transport code copies
transport->progress into send_pack_args->progress, and they
both have the same meaning.
However, the code path of calling "git send-pack" was left
behind. It always sets "progress" to 0, and thus always
tells pack-objects to be quiet. We can work around this by
checking isatty(2) ourselves in the cmd_send_pack code path,
restoring the original behavior of the send-pack command.
Signed-off-by: Jeff King <peff@peff.net>
---
builtin/send-pack.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 9df341c..7d22715 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -492,6 +492,9 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
}
}
+ if (!args.quiet)
+ args.progress = isatty(2);
+
if (args.stateless_rpc) {
conn = NULL;
fd[0] = 0;
--
1.7.10.630.g31718
--
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.
You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en
next prev parent reply other threads:[~2012-05-01 8:41 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20120501010609.GA14715@jupiter.local>
2012-05-01 6:58 ` 1.7.10 doesn't show file pushstatus Jeff King
2012-05-01 7:33 ` Jeff King
2012-05-01 8:40 ` Jeff King
2012-05-01 8:41 ` Jeff King [this message]
2012-05-01 8:42 ` [PATCH 2/3] teach send-pack about --[no-]progress Jeff King
2012-05-01 8:43 ` [PATCH 3/3] t5541: test more combinations of --progress Jeff King
2012-05-01 9:35 ` Clemens Buchacher
2012-05-01 9:37 ` Jeff King
2012-05-01 17:53 ` David Ebbo
2012-05-01 20:45 ` Zbigniew Jędrzejewski-Szmek
2012-05-01 20:53 ` Junio C Hamano
2012-05-01 9:32 ` 1.7.10 doesn't show file pushstatus Clemens Buchacher
2012-05-01 17:33 ` Junio C Hamano
2012-05-02 1:04 ` Johannes Schindelin
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120501084139.GA4998@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=david.ebbo@gmail.com \
--cc=davidfowl@gmail.com \
--cc=drizzd@aon.at \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=msysgit@googlegroups.com \
--cc=paul@github.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.
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 NNTP newsgroup(s).