diff options
-rw-r--r-- | diff.c | 2 | ||||
-rwxr-xr-x | t/t4011-diff-symlink.sh | 5 |
2 files changed, 2 insertions, 5 deletions
@@ -1972,7 +1972,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); } diff --git a/t/t4011-diff-symlink.sh b/t/t4011-diff-symlink.sh index 164f15385..f0d5041c1 100755 --- a/t/t4011-diff-symlink.sh +++ b/t/t4011-diff-symlink.sh @@ -67,10 +67,7 @@ test_expect_success SYMLINKS 'diff removed symlink and file' ' ' test_expect_success SYMLINKS 'diff identical, but newly created symlink and file' ' - cat >expected <<-\EOF && - diff --git a/frotz b/frotz - diff --git a/nitfol b/nitfol - EOF + >expected && rm -f frotz nitfol && echo xyzzy >nitfol && test-chmtime +10 nitfol && |