diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-07-06 11:54:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-06 11:54:47 -0700 |
| commit | 84b889bd035886cb19b1e9a9524dcf8a431836cd (patch) | |
| tree | 6f86b3cc3d0aabcaf319e1d51931a7e7559c9369 /t | |
| parent | Merge branch 'tl/notes-separator' (diff) | |
| parent | apply: improve error messages when reading patch (diff) | |
| download | git-84b889bd035886cb19b1e9a9524dcf8a431836cd.tar.gz git-84b889bd035886cb19b1e9a9524dcf8a431836cd.zip | |
Merge branch 'pw/apply-too-large'
"git apply" punts when it is fed too large a patch input; the error
message it gives when it happens has been clarified.
* pw/apply-too-large:
apply: improve error messages when reading patch
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4141-apply-too-large.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4141-apply-too-large.sh b/t/t4141-apply-too-large.sh index 58742d4fc5..20cc1209f6 100755 --- a/t/t4141-apply-too-large.sh +++ b/t/t4141-apply-too-large.sh @@ -17,7 +17,7 @@ test_expect_success EXPENSIVE 'git apply rejects patches that are too large' ' EOF test-tool genzeros } | test_copy_bytes $sz | test_must_fail git apply 2>err && - grep "git apply: failed to read" err + grep "patch too large" err ' test_done |