]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'jc/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)
commit306eb9ae56571c256ecaec8198c08aa116782531
treee9c7b0eee487258dfa308e69e70f7aeb4deced8f
parente56c419347fa07bfc00b98fd70f4a4c526b75c8f
parent3da4413dbcdb8df021739ca6f20fe4f0bcd1fd3c
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