blob: 0e8ea7e2b8f24edea491cdf865c77158725f89fa (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
#!/bin/sh
#
# Copyright (c) 2007 Junio C Hamano
#
test_description='git-apply --whitespace=strip and configuration file.
'
. ./test-lib.sh
test_expect_success setup '
echo A >file1 &&
cp file1 saved &&
git add file1 &&
echo "B " >file1 &&
git diff >patch.file
'
test_expect_success 'apply --whitespace=strip' '
cp saved file1 &&
git update-index --refresh &&
git apply --whitespace=strip patch.file &&
if grep " " file1
then
echo "Eh?"
false
else
echo Happy
fi
'
test_expect_success 'apply --whitespace=strip from config' '
cp saved file1 &&
git update-index --refresh &&
git config apply.whitespace strip &&
git apply patch.file &&
if grep " " file1
then
echo "Eh?"
false
else
echo Happy
fi
'
mkdir sub
D=`pwd`
test_expect_success 'apply --whitespace=strip in subdir' '
cd "$D" &&
git config --unset-all apply.whitespace
cp saved file1 &&
git update-index --refresh &&
cd sub &&
git apply --whitespace=strip ../patch.file &&
if grep " " ../file1
then
echo "Eh?"
false
else
echo Happy
fi
'
test_expect_success 'apply --whitespace=strip from config in subdir' '
cd "$D" &&
git config apply.whitespace strip &&
cp saved file1 &&
git update-index --refresh &&
cd sub &&
git apply ../patch.file &&
if grep " " file1
then
echo "Eh?"
false
else
echo Happy
fi
'
test_done
|
