diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-26 19:48:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-26 19:48:18 -0700 |
| commit | e56c419347fa07bfc00b98fd70f4a4c526b75c8f (patch) | |
| tree | b9287cb4f61056fe7bdc50b43bae96c450126818 /t | |
| parent | 81f86aacc4eb74cdb9c2c8082d36d2070c666045 (diff) | |
| parent | 623f7af28417805d941b1618157b9d93c02347af (diff) | |
| download | git-e56c419347fa07bfc00b98fd70f4a4c526b75c8f.tar.gz | |
Merge branch 'jk/diff-from-contents-fix' into maint-2.51
Recently we attempted to improve "git diff -w" and friends to
handle cases where patch output would be suppressed, but it
introduced a bug that emits unnecessary output, which has been
corrected.
* jk/diff-from-contents-fix:
diff: restore redirection to /dev/null for diff_from_contents
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4035-diff-quiet.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t4035-diff-quiet.sh b/t/t4035-diff-quiet.sh index 0352bf81a9..35eaf0855f 100755 --- a/t/t4035-diff-quiet.sh +++ b/t/t4035-diff-quiet.sh @@ -50,6 +50,10 @@ test_expect_success 'git diff-tree HEAD HEAD' ' test_expect_code 0 git diff-tree --quiet HEAD HEAD >cnt && test_line_count = 0 cnt ' +test_expect_success 'git diff-tree -w HEAD^ HEAD' ' + test_expect_code 1 git diff-tree --quiet -w HEAD^ HEAD >cnt && + test_line_count = 0 cnt +' test_expect_success 'git diff-files' ' test_expect_code 0 git diff-files --quiet >cnt && test_line_count = 0 cnt |