undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ap/checkout-no-progress-for-non-tty'

Browse Source 
The progress indicator for a large "git checkout" was sent to stderr
even if it is not a terminal.
This commit is contained in:
Junio C Hamano 2012-05-25 12:06:34 -07:00
commit aed79af5d9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/checkout.c
View File

@ -343,7 +343,7 @@ static int reset_tree(struct tree *tree, struct checkout_opts *o, int worktree)
opts.reset = 1; opts.reset = 1;
opts.merge = 1; opts.merge = 1;
opts.fn = oneway_merge; opts.fn = oneway_merge;
opts.verbose_update = !o->quiet; opts.verbose_update = !o->quiet && isatty(2);
opts.src_index = &the_index; opts.src_index = &the_index;
opts.dst_index = &the_index; opts.dst_index = &the_index;
parse_tree(tree); parse_tree(tree);
@ -420,7 +420,7 @@ static int merge_working_tree(struct checkout_opts *opts,
topts.update = 1; topts.update = 1;
topts.merge = 1; topts.merge = 1;
topts.gently = opts->merge && old->commit; topts.gently = opts->merge && old->commit;
topts.verbose_update = !opts->quiet; topts.verbose_update = !opts->quiet && isatty(2);
topts.fn = twoway_merge; topts.fn = twoway_merge;
if (opts->overwrite_ignore) { if (opts->overwrite_ignore) {
topts.dir = xcalloc(1, sizeof(*topts.dir)); topts.dir = xcalloc(1, sizeof(*topts.dir));