diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-15 10:29:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-15 10:29:29 -0700 |
| commit | 77f8e1002be5c736e064ed0e656ba51c82d85b5d (patch) | |
| tree | 9a23ed4398489b2f25a6cab195fc40f9af8d8d07 /t/t4015-diff-whitespace.sh | |
| parent | Merge branch 'jc/diff-no-index-in-subdir' into maint-2.51 (diff) | |
| parent | diff: ensure consistent diff behavior with ignore options (diff) | |
| download | git-77f8e1002be5c736e064ed0e656ba51c82d85b5d.tar.gz git-77f8e1002be5c736e064ed0e656ba51c82d85b5d.zip | |
Merge branch 'ly/diff-name-only-with-diff-from-content' into maint-2.51
Various options to "git diff" that makes comparison ignore certain
aspects of the differences (like "space changes are ignored",
"differences in lines that match these regular expressions are
ignored") did not work well with "--name-only" and friends.
* ly/diff-name-only-with-diff-from-content:
diff: ensure consistent diff behavior with ignore options
Diffstat (limited to 't/t4015-diff-whitespace.sh')
| -rwxr-xr-x | t/t4015-diff-whitespace.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index 52e3e476ff..9de7f73f42 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -11,12 +11,8 @@ test_description='Test special whitespace in diff engine. . "$TEST_DIRECTORY"/lib-diff.sh for opt_res in --patch --quiet -s --stat --shortstat --dirstat=lines \ - --raw! --name-only! --name-status! + --raw --name-only --name-status do - opts=${opt_res%!} expect_failure= - test "$opts" = "$opt_res" || - expect_failure="test_expect_code 1" - test_expect_success "status with $opts (different)" ' echo foo >x && git add x && @@ -43,7 +39,7 @@ do echo foo >x && git add x && echo " foo" >x && - $expect_failure git diff -w $opts --exit-code x + git diff -w $opts --exit-code x ' done |