Merge branch 'ew/diff'

diff --git a/diff.c b/diff.c
index 493650cc0eccfcb91422f3e4ff7de766590ba22c..e101bfd8c808e832a209d352d677e7d8a666a5ec 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -117,8 +117,14 @@ int git_diff_ui_config(const char *var, const char *value)
        if (!strcmp(var, "diff.color")) {
                if (!value)
                        diff_use_color_default = 1; /* bool */
-               else if (!strcasecmp(value, "auto"))
-                       diff_use_color_default = isatty(1);
+               else if (!strcasecmp(value, "auto")) {
+                       diff_use_color_default = 0;
+                       if (isatty(1) || pager_in_use) {
+                               char *term = getenv("TERM");
+                               if (term && strcmp(term, "dumb"))
+                                       diff_use_color_default = 1;
+                       }
+               }
                else if (!strcasecmp(value, "never"))
                        diff_use_color_default = 0;
                else if (!strcasecmp(value, "always"))