Skip to content

Commit

Permalink
sideband.c: do not use ANSI control sequence on non-terminal
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael Naumov authored and Junio C Hamano committed Jun 2, 2014
1 parent 4a28f16 commit 38de156
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sideband.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ int recv_sideband(const char *me, int in_stream, int out)

memcpy(buf, PREFIX, pf);
term = getenv("TERM");
if (term && strcmp(term, "dumb"))
if (isatty(2) && term && strcmp(term, "dumb"))
suffix = ANSI_SUFFIX;
else
suffix = DUMB_SUFFIX;
Expand Down

0 comments on commit 38de156

Please sign in to comment.