From: Jeff King <peff@peff.net>
To: Avery Pennarun <apenwarr@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] progress: don't print if !isatty(2).
Date: Thu, 24 May 2012 01:45:06 -0400 [thread overview]
Message-ID: <20120524054506.GA3440@sigill.intra.peff.net> (raw)
In-Reply-To: <1337836732-26778-1-git-send-email-apenwarr@gmail.com>
On Thu, May 24, 2012 at 01:18:52AM -0400, Avery Pennarun wrote:
> If stderr isn't a tty, we shouldn't be printing incremental progress
> messages. In particular, this affected 'git checkout -f . >&logfile' unless
> you provided -q. And git-new-workdir has no way to provide -q.
Makes sense to fix checkout, but...
> diff --git a/progress.c b/progress.c
> index 3971f49..4d9f416 100644
> --- a/progress.c
> +++ b/progress.c
> @@ -211,9 +211,11 @@ int display_progress(struct progress *progress, unsigned n)
> struct progress *start_progress_delay(const char *title, unsigned total,
> unsigned percent_treshold, unsigned delay)
> {
> - struct progress *progress = malloc(sizeof(*progress));
> + struct progress *progress = NULL;
> + if (isatty(2))
> + progress = malloc(sizeof(*progress));
This is the wrong place to put the fix. The user might have asked git to
override the isatty(2) check and show progress anyway (e.g., "git push
--progress"), and this would break that case.
The fix has to go in builtin/checkout.c, and probably looks like this:
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 3ddda34..e8c1b1f 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -343,7 +343,7 @@ static int reset_tree(struct tree *tree, struct checkout_opts *o, int worktree)
opts.reset = 1;
opts.merge = 1;
opts.fn = oneway_merge;
- opts.verbose_update = !o->quiet;
+ opts.verbose_update = !o->quiet && isatty(2);
opts.src_index = &the_index;
opts.dst_index = &the_index;
parse_tree(tree);
@@ -420,7 +420,7 @@ static int merge_working_tree(struct checkout_opts *opts,
topts.update = 1;
topts.merge = 1;
topts.gently = opts->merge && old->commit;
- topts.verbose_update = !opts->quiet;
+ topts.verbose_update = !opts->quiet && isatty(2);
topts.fn = twoway_merge;
if (opts->overwrite_ignore) {
topts.dir = xcalloc(1, sizeof(*topts.dir));
but I did not test it.
-Peff
next prev parent reply other threads:[~2012-05-24 5:45 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-24 5:18 [PATCH] progress: don't print if !isatty(2) Avery Pennarun
2012-05-24 5:45 ` Jeff King [this message]
2012-05-24 6:05 ` [PATCH] checkout: default to quiet " Avery Pennarun
2012-05-24 6:10 ` Jeff King
2012-05-24 6:12 ` [PATCH v2] checkout: no progress messages " Avery Pennarun
2012-05-24 18:29 ` Junio C Hamano
2012-05-24 18:34 ` Jeff King
2012-05-24 18:49 ` Avery Pennarun
2012-05-24 18:46 ` Avery Pennarun
2012-05-24 21:46 ` Junio C Hamano
2012-05-24 6:12 ` [PATCH] checkout: default to quiet " Avery Pennarun
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=20120524054506.GA3440@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).