summaryrefslogtreecommitdiff
path: root/t/t4119-apply-config.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-21 09:14:22 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-21 09:14:22 (GMT)
commitc24e9757e9f608ad3985ee9093d28ca5cd37f052 (patch)
tree34b5b0fa951fa046bce992ceb735ad2d30deb638 /t/t4119-apply-config.sh
parenteac70c4f64a618744e05d4a5be61a356c0011033 (diff)
downloadgit-c24e9757e9f608ad3985ee9093d28ca5cd37f052.zip
git-c24e9757e9f608ad3985ee9093d28ca5cd37f052.tar.gz
git-c24e9757e9f608ad3985ee9093d28ca5cd37f052.tar.bz2
t4119: add test for traditional patch and different p_value
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4119-apply-config.sh')
-rwxr-xr-xt/t4119-apply-config.sh51
1 files changed, 49 insertions, 2 deletions
diff --git a/t/t4119-apply-config.sh b/t/t4119-apply-config.sh
index 816b5b8..f9b9425 100755
--- a/t/t4119-apply-config.sh
+++ b/t/t4119-apply-config.sh
@@ -18,6 +18,15 @@ test_expect_success setup '
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 &&
@@ -29,8 +38,12 @@ test_expect_success 'apply --whitespace=strip' '
then
echo "Eh?"
false
- else
+ elif grep B sub/file1
+ then
echo Happy
+ else
+ echo "Huh?"
+ false
fi
'
@@ -46,6 +59,9 @@ test_expect_success 'apply --whitespace=strip from config' '
then
echo "Eh?"
false
+ elif grep B sub/file1
+ then
+ echo Happy
else
echo Happy
fi
@@ -67,8 +83,12 @@ test_expect_success 'apply --whitespace=strip in subdir' '
then
echo "Eh?"
false
- else
+ elif grep B file1
+ then
echo Happy
+ else
+ echo "Huh?"
+ false
fi
'
@@ -86,8 +106,35 @@ test_expect_success 'apply --whitespace=strip from config in subdir' '
then
echo "Eh?"
false
+ elif grep B file1
+ then
+ echo Happy
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
+ else
+ echo "Huh?"
+ false
fi
'