From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Oct 2025 02:48:18 +0000 (-0700)
Subject: Merge branch 'jc/diff-from-contents-fix' into maint-2.51
X-Git-Tag: v2.51.2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=306eb9ae56571c256ecaec8198c08aa116782531;p=thirdparty%2Fgit.git

Merge branch 'jc/diff-from-contents-fix' into maint-2.51

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

306eb9ae56571c256ecaec8198c08aa116782531