summaryrefslogtreecommitdiff
path: root/t/t4119-apply-config.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-22 00:18:45 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-22 00:18:45 (GMT)
commitfe6e0eecb03379e6acb742f77b0b5f589a7b7422 (patch)
treebf269623546b99956db52d12f1d4fb23ead95678 /t/t4119-apply-config.sh
parent3e8a5db966c26a0a986161103d59683b909a6c78 (diff)
downloadgit-fe6e0eecb03379e6acb742f77b0b5f589a7b7422.zip
git-fe6e0eecb03379e6acb742f77b0b5f589a7b7422.tar.gz
git-fe6e0eecb03379e6acb742f77b0b5f589a7b7422.tar.bz2
t4119: test autocomputing -p<n> for traditional diff input.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4119-apply-config.sh')
-rwxr-xr-xt/t4119-apply-config.sh117
1 files changed, 43 insertions, 74 deletions
diff --git a/t/t4119-apply-config.sh b/t/t4119-apply-config.sh
index 55f4673..620a920 100755
--- a/t/t4119-apply-config.sh
+++ b/t/t4119-apply-config.sh
@@ -33,24 +33,28 @@ sed -e '
/^+++ /s|file1|b/sub/&|
' gpatch.file >gpatch-ab-sub.file &&
-test_expect_success 'apply --whitespace=strip' '
-
- rm -f sub/file1 &&
- cp saved sub/file1 &&
- git update-index --refresh &&
-
- git apply --whitespace=strip patch.file &&
- if grep " " sub/file1
+check_result () {
+ if grep " " "$1"
then
echo "Eh?"
false
- elif grep B sub/file1
+ elif grep B "$1"
then
echo Happy
else
echo "Huh?"
false
fi
+}
+
+test_expect_success 'apply --whitespace=strip' '
+
+ rm -f sub/file1 &&
+ cp saved sub/file1 &&
+ git update-index --refresh &&
+
+ git apply --whitespace=strip patch.file &&
+ check_result sub/file1
'
test_expect_success 'apply --whitespace=strip from config' '
@@ -61,16 +65,7 @@ test_expect_success 'apply --whitespace=strip from config' '
git config apply.whitespace strip &&
git apply patch.file &&
- if grep " " sub/file1
- then
- echo "Eh?"
- false
- elif grep B sub/file1
- then
- echo Happy
- else
- echo Happy
- fi
+ check_result sub/file1
'
D=`pwd`
@@ -85,17 +80,7 @@ test_expect_success 'apply --whitespace=strip in subdir' '
cd sub &&
git apply --whitespace=strip ../patch.file &&
- if grep " " file1
- then
- echo "Eh?"
- false
- elif grep B file1
- then
- echo Happy
- else
- echo "Huh?"
- false
- fi
+ check_result file1
'
test_expect_success 'apply --whitespace=strip from config in subdir' '
@@ -108,17 +93,7 @@ test_expect_success 'apply --whitespace=strip from config in subdir' '
cd sub &&
git apply ../patch.file &&
- if grep " " file1
- then
- echo "Eh?"
- false
- elif grep B file1
- then
- echo Happy
- else
- echo "Huh?"
- false
- fi
+ check_result file1
'
test_expect_success 'same in subdir but with traditional patch input' '
@@ -131,17 +106,7 @@ test_expect_success 'same in subdir but with traditional patch input' '
cd sub &&
git apply ../gpatch.file &&
- if grep " " file1
- then
- echo "Eh?"
- false
- elif grep B file1
- then
- echo Happy
- else
- echo "Huh?"
- false
- fi
+ check_result file1
'
test_expect_success 'same but with traditional patch input of depth 1' '
@@ -154,17 +119,7 @@ test_expect_success 'same but with traditional patch input of depth 1' '
cd sub &&
git apply ../gpatch-sub.file &&
- if grep " " file1
- then
- echo "Eh?"
- false
- elif grep B file1
- then
- echo Happy
- else
- echo "Huh?"
- false
- fi
+ check_result file1
'
test_expect_success 'same but with traditional patch input of depth 2' '
@@ -177,17 +132,31 @@ test_expect_success 'same but with traditional patch input of depth 2' '
cd sub &&
git apply ../gpatch-ab-sub.file &&
- if grep " " file1
- then
- echo "Eh?"
- false
- elif grep B file1
- then
- echo Happy
- else
- echo "Huh?"
- false
- fi
+ check_result file1
+'
+
+test_expect_success 'same but with traditional patch input of depth 1' '
+
+ cd "$D" &&
+ git config apply.whitespace strip &&
+ rm -f sub/file1 &&
+ cp saved sub/file1 &&
+ git update-index --refresh &&
+
+ git apply -p0 gpatch-sub.file &&
+ check_result sub/file1
+'
+
+test_expect_success 'same but with traditional patch input of depth 2' '
+
+ cd "$D" &&
+ git config apply.whitespace strip &&
+ rm -f sub/file1 &&
+ cp saved sub/file1 &&
+ git update-index --refresh &&
+
+ git apply gpatch-ab-sub.file &&
+ check_result sub/file1
'
test_done