The correct fix would be in start_progress_delay(), however this breaks
the progress bar for fetch/push via ssh. So fix it in this caller which
will always run locally.
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
---
unpack-trees.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 720f7a1..a11f559 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -75,7 +75,7 @@ static int check_updates(struct unpack_trees_options *o)
int i;
int errs = 0;
- if (o->update && o->verbose_update) {
+ if (o->update && o->verbose_update && isatty(STDERR_FILENO)) {
for (total = cnt = 0; cnt < index->cache_nr; cnt++) {
struct cache_entry *ce = index->cache[cnt];
if (ce->ce_flags & (CE_UPDATE | CE_REMOVE))
--
1.6.4.13.ge6580.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html