[PATCH] sideband.c: Get rid of ANSI sequences for non-terminal shell
- From
Naumov, Michael (North Sydney) <michael.naumov@fiserv.com>
- Date
- Jun 2, 2014, 23:40 UTC
- Message-ID
- <81E85F13A4BE084BAF4B1AA24173EDA0144E47EC@JWPKEXMBX03.corp.checkfree.com>
From: Michael Naumov <mnaoumov@gmail.com>
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).
Signed-off-by: Michael Naumov <mnaoumov@gmail.com> Thanks-to: Erik Faye-Lund <kusmabite@gmail.com> Thanks-to: Jeff King <peff@peff.net> --- sideband.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sideband.c b/sideband.c index d1125f5..7f9dc22 100644 --- a/sideband.c +++ b/sideband.c @@ -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;
-- 1.8.3.msysgit.0 P.S. I gave up trying to send this letter from gmail, it eats my tab character P.S 2. Sorry, my tab character has been eaten again! P.S 3. Wrapped the letter lines to fit on the terminal P.S 4. GitExtensions tried to use TERM=dumb but this caused process leakage for diff tools. See https://github.com/gitextensions/gitextensions/issues/1092 Regards, Michael