diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-11-03 06:49:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-11-03 06:49:55 -0800 |
| commit | 249b0d3f037083eef1c11c55cc76e0e9cd5eeed5 (patch) | |
| tree | 89c38e1a9896c5def3abd210f530a1ce27be6b1f /t | |
| parent | Merge branch 'ps/maintenance-geometric' (diff) | |
| parent | diff: simplify run_external_diff() quiet logic (diff) | |
| download | git-249b0d3f037083eef1c11c55cc76e0e9cd5eeed5.tar.gz git-249b0d3f037083eef1c11c55cc76e0e9cd5eeed5.zip | |
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4020-diff-external.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh index c8a23d5148..7ec5854f74 100755 --- a/t/t4020-diff-external.sh +++ b/t/t4020-diff-external.sh @@ -44,6 +44,16 @@ test_expect_success 'GIT_EXTERNAL_DIFF environment and --no-ext-diff' ' ' +test_expect_success 'GIT_EXTERNAL_DIFF and --output' ' + cat >expect <<-EOF && + file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644 + EOF + GIT_EXTERNAL_DIFF=echo git diff --output=out >stdout && + cut -d" " -f1,3- <out >actual && + test_must_be_empty stdout && + test_cmp expect actual +' + test_expect_success SYMLINKS 'typechange diff' ' rm -f file && ln -s elif file && |