summaryrefslogtreecommitdiff
path: root/transport-helper.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-17 15:58:58 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-17 15:58:58 -0800
commit42aac96763a72b5bac73d34640d3a0c6233027a6 (patch)
tree8979b93510d3d1fe1334c72fc47c4f91c90b07f3 /transport-helper.c
parentd0605072911a4c93a7eacf1fb55e79227c457e34 (diff)
parent5a518ad4679c91f0d0afd38fcc3cbf04e8699c46 (diff)
downloadgit-42aac96763a72b5bac73d34640d3a0c6233027a6.tar.gz
Merge branch 'tc/clone-v-progress'
* tc/clone-v-progress: clone: use --progress to force progress reporting clone: set transport->verbose when -v/--verbose is used git-clone.txt: reword description of progress behaviour check stderr with isatty() instead of stdout when deciding to show progress Conflicts: transport.c
Diffstat (limited to 'transport-helper.c')
-rw-r--r--transport-helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/transport-helper.c b/transport-helper.c
index 6ece0d9875..ca8fa92e63 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -273,7 +273,7 @@ static void standard_options(struct transport *t)
char buf[16];
int n;
int v = t->verbose;
- int no_progress = v < 0 || (!t->progress && !isatty(1));
+ int no_progress = v < 0 || (!t->progress && !isatty(2));
set_helper_option(t, "progress", !no_progress ? "true" : "false");