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

sideband.c: do not use ANSI control sequence on non-terminal

Browse Source 
Diagnostic messages received on the sideband #2 from the server side
are sent to the standard error with ANSI terminal control sequence
"\033[K" that erases to the end of line appended at the end of each
line.

However, some programs (e.g. GitExtensions for Windows) read and
interpret and/or show the message without understanding the terminal
control sequences, resulting them to be shown to their end users.
To help these programs, squelch the control sequence when the
standard error stream is not being sent to a tty.

NOTE: I considered to cover the case that a pager has already been
started. But decided that is probably not worth worrying about here,
though, as we shouldn't be using a pager for commands that do network
communications (and if we do, omitting the magic line-clearing signal
is probably a sane thing to do).

Thanks-to: Erik Faye-Lund <kusmabite@gmail.com>
Thanks-to: Jeff King <peff@peff.net>
Signed-off-by: Michael Naumov <mnaoumov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Naumov 2014-05-28 03:12:15 +00:00 committed by Junio C Hamano
parent 4a28f169ad
commit 38de156a05
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sideband.c
View File

@ -30,7 +30,7 @@ int recv_sideband(const char *me, int in_stream, int out)
memcpy(buf, PREFIX, pf); memcpy(buf, PREFIX, pf);
term = getenv("TERM"); term = getenv("TERM");
if (term && strcmp(term, "dumb")) if (isatty(2) && term && strcmp(term, "dumb"))
suffix = ANSI_SUFFIX; suffix = ANSI_SUFFIX;
else else
suffix = DUMB_SUFFIX; suffix = DUMB_SUFFIX;