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

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

The code to squelch output from "git diff -w --name-status"
etc. for paths that "git diff -w -p" would have stayed silent
leaked output from dry-run patch generation, which has been
corrected.

* jc/diff-from-contents-fix:
  diff: make sure the other caller of diff_flush_patch_quietly() is silent
---

5139fce01fc4214d12b91e6a21f9c50fd3a7cd50