diff options
| author | Avery Pennarun <apenwarr@gmail.com> | 2012-05-24 02:12:24 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-24 11:29:07 -0700 |
| commit | e9fc64c60a71a190016a9e9bcb81195a0fa0d9f4 (patch) | |
| tree | 9d5586d7c51ddfe8fe30bcd599318922d501bdbe | |
| parent | 17a9ac7d6b5f27eb5f8efee324e88db2b6ec9bd6 (diff) | |
| download | git-e9fc64c60a71a190016a9e9bcb81195a0fa0d9f4.tar.gz git-e9fc64c60a71a190016a9e9bcb81195a0fa0d9f4.tar.xz | |
checkout: no progress messages if !isatty(2).
If stderr isn't a tty, we shouldn't be printing incremental progress
messages. In particular, this affects 'git checkout -f . >&logfile'
unless you provided -q. And git-new-workdir has no way to provide -q.
It would probably be better to have progress.c check isatty(2) all the time,
but that wouldn't allow things like 'git push --progress' to force progress
reporting to on, so I won't try to solve the general case right now.
Actual fix suggested by Jeff King.
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/checkout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index c3647934c..f9f7f40af 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)); |