t4119: add test for traditional patch and different p_value

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/t/t4119-apply-config.sh b/t/t4119-apply-config.sh
index 816b5b8fb2388e59d99532f49a5c46f81dfc8125..f9b94251530fb2b7913af7a1aaf9b5fbbeb78cd3 100755 (executable)
--- a/t/t4119-apply-config.sh
+++ b/t/t4119-apply-config.sh
@@ -18,6 +18,15 @@ test_expect_success setup '
        git diff >patch.file
 '
 
        git diff >patch.file
 '
 

+# Also handcraft GNU diff output; note this has trailing whitespace.
+cat >gpatch.file <<\EOF
+--- file1      2007-02-21 01:04:24.000000000 -0800
++++ file1+     2007-02-21 01:07:44.000000000 -0800
+@@ -1 +1 @@
+-A
++B 
+EOF
+

 test_expect_success 'apply --whitespace=strip' '
 
        rm -f sub/file1 &&
 test_expect_success 'apply --whitespace=strip' '
 
        rm -f sub/file1 &&


@@ -29,8 +38,12 @@ test_expect_success 'apply --whitespace=strip' '
        then
                echo "Eh?"
                false
        then
                echo "Eh?"
                false

-       else
+       elif grep B sub/file1
+       then

                echo Happy
                echo Happy

+       else
+               echo "Huh?"
+               false

        fi
 '
 
        fi
 '
 


@@ -46,6 +59,9 @@ test_expect_success 'apply --whitespace=strip from config' '
        then
                echo "Eh?"
                false
        then
                echo "Eh?"
                false

+       elif grep B sub/file1
+       then
+               echo Happy

        else
                echo Happy
        fi
        else
                echo Happy
        fi


@@ -67,8 +83,12 @@ test_expect_success 'apply --whitespace=strip in subdir' '
        then
                echo "Eh?"
                false
        then
                echo "Eh?"
                false

-       else
+       elif grep B file1
+       then

                echo Happy
                echo Happy

+       else
+               echo "Huh?"
+               false

        fi
 '
 
        fi
 '
 


@@ -86,8 +106,35 @@ test_expect_success 'apply --whitespace=strip from config in subdir' '
        then
                echo "Eh?"
                false
        then
                echo "Eh?"
                false

+       elif grep B file1
+       then
+               echo Happy

        else
        else

+               echo "Huh?"
+               false
+       fi
+'
+
+test_expect_success 'same in subdir but with traditional patch input' '
+
+       cd "$D" &&
+       git config apply.whitespace strip &&
+       rm -f sub/file1 &&
+       cp saved sub/file1 &&
+       git update-index --refresh &&
+
+       cd sub &&
+       git apply -p0 ../gpatch.file &&
+       if grep " " file1
+       then
+               echo "Eh?"
+               false
+       elif grep B file1
+       then

                echo Happy
                echo Happy

+       else
+               echo "Huh?"
+               false

        fi
 '
 
        fi
 '