diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-17 15:58:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 15:58:58 -0800 |
| commit | 42aac96763a72b5bac73d34640d3a0c6233027a6 (patch) | |
| tree | 8979b93510d3d1fe1334c72fc47c4f91c90b07f3 /transport.c | |
| parent | d0605072911a4c93a7eacf1fb55e79227c457e34 (diff) | |
| parent | 5a518ad4679c91f0d0afd38fcc3cbf04e8699c46 (diff) | |
| download | git-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.c')
| -rw-r--r-- | transport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/transport.c b/transport.c index 3b489b392b..c3f156ea04 100644 --- a/transport.c +++ b/transport.c @@ -478,7 +478,7 @@ static int fetch_refs_via_pack(struct transport *transport, args.include_tag = data->options.followtags; args.verbose = (transport->verbose > 0); args.quiet = (transport->verbose < 0); - args.no_progress = args.quiet || (!transport->progress && !isatty(1)); + args.no_progress = args.quiet || (!transport->progress && !isatty(2)); args.depth = data->options.depth; for (i = 0; i < nr_heads; i++) |