From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Nov 2025 14:49:55 +0000 (-0800)
Subject: Merge branch 'jk/diff-patch-dry-run-cleanup'
X-Git-Tag: v2.52.0-rc0~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=249b0d3f037083eef1c11c55cc76e0e9cd5eeed5;p=thirdparty%2Fgit.git

Merge branch 'jk/diff-patch-dry-run-cleanup'

Finishing touches to fixes to the recent regression in "git diff -w
--quiet" and anything that needs to internally generate patch to
see if it turns empty.

* jk/diff-patch-dry-run-cleanup:
  diff: simplify run_external_diff() quiet logic
  diff: drop dry-run redirection to /dev/null
  diff: replace diff_options.dry_run flag with NULL file
  diff: drop save/restore of color_moved in dry-run mode
  diff: send external diff output to diff_options.file
---

249b0d3f037083eef1c11c55cc76e0e9cd5eeed5