Merge branch 'rb/maint-python-path'

diff --git a/t/t4120-apply-popt.sh b/t/t4120-apply-popt.sh
index 2f672f30d424ace13d24236a0a9e90324cb2b4da..b463b4f05ce43ee345a0594528d684befe7c2ef3 100755 (executable)
--- a/t/t4120-apply-popt.sh
+++ b/t/t4120-apply-popt.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2007 Shawn O. Pearce
 #
 
-test_description='git-apply -p handling.'
+test_description='git apply -p handling.'
 
 . ./test-lib.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