diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:50 -0800 |
| commit | df91d0e4d30ddc9bf2c55e3a63be9cb5318a409a (patch) | |
| tree | 0de68b9b3ef9f2b0a72363af19fce18156d31537 /t | |
| parent | fcb2a7e4a3c7899a3432f5804889fa3ea5779220 (diff) | |
| parent | 158620872737067e4a74ca7aed5302af8debb714 (diff) | |
| download | git-df91d0e4d30ddc9bf2c55e3a63be9cb5318a409a.tar.gz git-df91d0e4d30ddc9bf2c55e3a63be9cb5318a409a.tar.xz | |
Merge branch 'ag/maint-apply-too-large-p'
* ag/maint-apply-too-large-p:
builtin-apply.c: Skip filenames without enough components
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4120-apply-popt.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t4120-apply-popt.sh b/t/t4120-apply-popt.sh index 83d4ba679..b463b4f05 100755 --- a/t/t4120-apply-popt.sh +++ b/t/t4120-apply-popt.sh @@ -22,4 +22,9 @@ test_expect_success 'apply git diff with -p2' ' git apply -p2 patch.file ' +test_expect_success 'apply with too large -p' ' + test_must_fail git apply --stat -p3 patch.file 2>err && + grep "removing 3 leading" err +' + test_done |