diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-16 10:09:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-16 10:09:23 -0700 |
| commit | db271e7bb60d42f3d6eadce99ee7cd8749b49754 (patch) | |
| tree | bdafbd409309ec3ff0978c66967671aa990ce455 /t/t4020-diff-external.sh | |
| parent | 19fe900cfce8096b7645ec9611a0b981f6bbd154 (diff) | |
| parent | e37423f081bb6e21eb1b77851ab06d72f30aee57 (diff) | |
Merge branch 'rs/external-diff-with-exit-code'
* rs/external-diff-with-exit-code:
Revert "diff: fix --exit-code with external diff"
Diffstat (limited to 't/t4020-diff-external.sh')
| -rwxr-xr-x | t/t4020-diff-external.sh | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh index 26430ca66b..fdd865f7c3 100755 --- a/t/t4020-diff-external.sh +++ b/t/t4020-diff-external.sh @@ -172,14 +172,6 @@ test_expect_success 'no diff with -diff' ' grep Binary out ' -test_expect_success 'diff.external and --exit-code with output' ' - test_expect_code 1 git -c diff.external=echo diff --exit-code -' - -test_expect_success 'diff.external and --exit-code without output' ' - git -c diff.external=true diff --exit-code -' - echo NULZbetweenZwords | perl -pe 'y/Z/\000/' > file test_expect_success 'force diff with "diff"' ' |