]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/diff-from-contents-fix' into maint-2.51
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Oct 2025 02:48:18 +0000 (19:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Oct 2025 02:48:18 +0000 (19:48 -0700)
Recently we attempted to improve "git diff -w" and friends to
handle cases where patch output would be suppressed, but it
introduced a bug that emits unnecessary output, which has been
corrected.

* jk/diff-from-contents-fix:
  diff: restore redirection to /dev/null for diff_from_contents


Trivial merge