]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commit249b0d3f037083eef1c11c55cc76e0e9cd5eeed5
tree89c38e1a9896c5def3abd210f530a1ce27be6b1f
parent3cf3369e8114c79fe2e54714cbf6dcae8b7fad9a
parent2ecb8857e7785b6b27887164cb1aca67ce0b114a
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