From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 24 Oct 2025 16:10:37 +0000 (-0700)
Subject: Merge branch 'jk/diff-from-contents-fix'
X-Git-Tag: v2.52.0-rc0~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88b3704ab17b16d5d6f7f5cf7129e800ad22e282;p=thirdparty%2Fgit.git

Merge branch 'jk/diff-from-contents-fix'

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
---

88b3704ab17b16d5d6f7f5cf7129e800ad22e282