tests: unset COLUMNS inherited from environment

[git.git] / diff.c

diff --git a/diff.c b/diff.c
index f47bffa2a3641cbf69b2e6d3f0f6c93b05f2c716..377ec1ea4cd90524f7c7525846fc95c3a9e66920 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2255,7 +2255,7 @@ static void builtin_diff(const char *name_a,
                struct emit_callback ecbdata;
                const struct userdiff_funcname *pe;
 
-               if (!DIFF_XDL_TST(o, WHITESPACE_FLAGS) || must_show_header) {
+               if (must_show_header) {
                        fprintf(o->file, "%s", header.buf);
                        strbuf_reset(&header);
                }