Merge branch 'nd/shared-index-fix' into maint

diff --git a/sideband.c b/sideband.c
index 1e4d684d6c5dcdeee94f6eb64cfa6e2f17d44674..6d7f943e4384fa90001fbb73cc5b63e2c0cfa639 100644 (file)
--- a/sideband.c
+++ b/sideband.c
@@ -20,13 +20,12 @@
 
 int recv_sideband(const char *me, int in_stream, int out)
 {
-       const char *term, *suffix;
+       const char *suffix;
        char buf[LARGE_PACKET_MAX + 1];
        struct strbuf outbuf = STRBUF_INIT;
        int retval = 0;
 
-       term = getenv("TERM");
-       if (isatty(2) && term && strcmp(term, "dumb"))
+       if (isatty(2) && !is_terminal_dumb())
                suffix = ANSI_SUFFIX;
        else
                suffix = DUMB_SUFFIX;