]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/diff-patch-dry-run-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Nov 2025 14:49:55 +0000 (06:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Nov 2025 14:49:55 +0000 (06:49 -0800)
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


Trivial merge