[PATCH 1/3] send-pack: show progress when isatty(2)
- From
Jeff King <peff@peff.net>
- Date
- May 1, 2012, 08:41 UTC
- Message-ID
- <20120501084139.GA4998@sigill.intra.peff.net>
- 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