Merge branch 'jk/test-match-signal'

diff --git a/diff.c b/diff.c
index 8cdfdf32225102a8bfdb15c5e3551ee5956f5911..7d0341988083dae44f8833875762b0b978bbafc0 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3980,6 +3980,8 @@ int diff_opt_parse(struct diff_options *options,
                if (!options->file)
                        die_errno("Could not open '%s'", path);
                options->close_file = 1;
+               if (options->use_color != GIT_COLOR_ALWAYS)
+                       options->use_color = GIT_COLOR_NEVER;
                return argcount;
        } else
                return 0;