global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-20 14:50:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Will merge to master.

By Avery Pennarun
* ap/checkout-no-progress-for-non-tty:
  checkout: no progress messages if !isatty(2).
This commit is contained in:
Junio C Hamano
2012-05-24 20:52:07 -07:00
parent cf56fe6187 e9fc64c60a
commit dc473bdeba
1 changed files with 2 additions and 2 deletions
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.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));