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

check stderr with isatty() instead of stdout when deciding to show progress

Browse Source 
Make transport code (viz. transport.c::fetch_refs_via_pack() and
transport-helper.c::standard_options()) that decides to show progress
check if stderr is a terminal, instead of stdout. After all, progress
reports (via the API in progress.[ch]) are sent to stderr.

Update the documentation for git-clone to say "standard error" as well.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Tay Ray Chuan 2009-12-26 01:12:03 +08:00 committed by Junio C Hamano
parent 902f235378
commit 486a3d7164
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-clone.txt
View File

@ -101,7 +101,7 @@ objects from the source repository into a pack in the cloned repository.
--verbose:: --verbose::
-v:: -v::
Display the progress bar, even in case the standard output is not Display the progress bar, even in case the standard error is not
a terminal. a terminal.
--no-checkout:: --no-checkout::

2
transport-helper.c
View File

@ -144,7 +144,7 @@ static void standard_options(struct transport *t)
char buf[16]; char buf[16];
int n; int n;
int v = t->verbose; 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"); set_helper_option(t, "progress", !no_progress ? "true" : "false");

2
transport.c
View File

@ -476,7 +476,7 @@ static int fetch_refs_via_pack(struct transport *transport,
args.include_tag = data->followtags; args.include_tag = data->followtags;
args.verbose = (transport->verbose > 0); args.verbose = (transport->verbose > 0);
args.quiet = (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->depth; args.depth = data->depth;
for (i = 0; i < nr_heads; i++) for (i = 0; i < nr_heads; i++)

2
transport.h
View File

@ -26,7 +26,7 @@ struct transport {
int (*disconnect)(struct transport *connection); int (*disconnect)(struct transport *connection);
char *pack_lockfile; char *pack_lockfile;
signed verbose : 3; signed verbose : 3;
/* Force progress even if the output is not a tty */ /* Force progress even if stderr is not a tty */
unsigned progress : 1; unsigned progress : 1;
}; };