Merge branch 'maint'

diff --git a/t/t4116-apply-reverse.sh b/t/t4116-apply-reverse.sh
index 2685b2263017df96159542853b373ea261880ba4..9ae2b3a8efaad4430bbcea02152470b064263b2b 100755 (executable)
--- a/t/t4116-apply-reverse.sh
+++ b/t/t4116-apply-reverse.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-test_description='git-apply in reverse
+test_description='git apply in reverse
 
 '
 
@@ -82,4 +82,10 @@ test_expect_success 'apply in reverse without postimage' '
        )
 '
 
+test_expect_success 'reversing a whitespace introduction' '
+       sed "s/a/a /" < file1 > file1.new &&
+       mv file1.new file1 &&
+       git diff | git apply --reverse --whitespace=error
+'
+
 test_done