blob: a9a05838119c85bc017f1404b134d393029843b2 [file] [log] [blame]
Junio C Hamanodc7b2432007-02-17 13:12:52 -08001#!/bin/sh
2#
3# Copyright (c) 2007 Junio C Hamano
4#
5
Junio C Hamano5be60072007-07-02 22:52:14 -07006test_description='git apply --whitespace=strip and configuration file.
Junio C Hamanodc7b2432007-02-17 13:12:52 -08007
8'
9
10. ./test-lib.sh
11
12test_expect_success setup '
Junio C Hamano56185f42007-02-19 17:57:29 -080013 mkdir sub &&
14 echo A >sub/file1 &&
15 cp sub/file1 saved &&
16 git add sub/file1 &&
17 echo "B " >sub/file1 &&
Junio C Hamanodc7b2432007-02-17 13:12:52 -080018 git diff >patch.file
19'
20
Junio C Hamanoc24e9752007-02-21 01:14:22 -080021# Also handcraft GNU diff output; note this has trailing whitespace.
Jeff King74f16b02008-06-14 03:26:37 -040022tr '_' ' ' >gpatch.file <<\EOF &&
Junio C Hamanoc24e9752007-02-21 01:14:22 -080023--- file1 2007-02-21 01:04:24.000000000 -0800
24+++ file1+ 2007-02-21 01:07:44.000000000 -0800
25@@ -1 +1 @@
26-A
Jeff King74f16b02008-06-14 03:26:37 -040027+B_
Junio C Hamanoc24e9752007-02-21 01:14:22 -080028EOF
29
Junio C Hamano3e8a5db2007-02-21 16:05:56 -080030sed -e 's|file1|sub/&|' gpatch.file >gpatch-sub.file &&
31sed -e '
32 /^--- /s|file1|a/sub/&|
33 /^+++ /s|file1|b/sub/&|
34' gpatch.file >gpatch-ab-sub.file &&
35
Junio C Hamanofe6e0ee2007-02-21 16:18:45 -080036check_result () {
37 if grep " " "$1"
38 then
39 echo "Eh?"
40 false
41 elif grep B "$1"
42 then
43 echo Happy
44 else
45 echo "Huh?"
46 false
47 fi
48}
49
Junio C Hamanodc7b2432007-02-17 13:12:52 -080050test_expect_success 'apply --whitespace=strip' '
51
Junio C Hamano56185f42007-02-19 17:57:29 -080052 rm -f sub/file1 &&
53 cp saved sub/file1 &&
Junio C Hamanodc7b2432007-02-17 13:12:52 -080054 git update-index --refresh &&
55
56 git apply --whitespace=strip patch.file &&
Junio C Hamanofe6e0ee2007-02-21 16:18:45 -080057 check_result sub/file1
Junio C Hamanodc7b2432007-02-17 13:12:52 -080058'
59
60test_expect_success 'apply --whitespace=strip from config' '
61
Junio C Hamano56185f42007-02-19 17:57:29 -080062 rm -f sub/file1 &&
63 cp saved sub/file1 &&
Junio C Hamanodc7b2432007-02-17 13:12:52 -080064 git update-index --refresh &&
65
66 git config apply.whitespace strip &&
67 git apply patch.file &&
Junio C Hamanofe6e0ee2007-02-21 16:18:45 -080068 check_result sub/file1
Junio C Hamanodc7b2432007-02-17 13:12:52 -080069'
70
Elia Pinto6003eb12014-04-30 09:23:05 -070071D=$(pwd)
Junio C Hamanodc7b2432007-02-17 13:12:52 -080072
73test_expect_success 'apply --whitespace=strip in subdir' '
74
75 cd "$D" &&
Jonathan Niedera48fcd82010-10-30 20:46:54 -050076 git config --unset-all apply.whitespace &&
Junio C Hamano56185f42007-02-19 17:57:29 -080077 rm -f sub/file1 &&
78 cp saved sub/file1 &&
Junio C Hamanodc7b2432007-02-17 13:12:52 -080079 git update-index --refresh &&
80
81 cd sub &&
Junio C Hamano9987d7c2007-02-21 14:31:10 -080082 git apply --whitespace=strip ../patch.file &&
Junio C Hamanofe6e0ee2007-02-21 16:18:45 -080083 check_result file1
Junio C Hamanodc7b2432007-02-17 13:12:52 -080084'
85
86test_expect_success 'apply --whitespace=strip from config in subdir' '
87
88 cd "$D" &&
89 git config apply.whitespace strip &&
Junio C Hamano56185f42007-02-19 17:57:29 -080090 rm -f sub/file1 &&
91 cp saved sub/file1 &&
Junio C Hamanodc7b2432007-02-17 13:12:52 -080092 git update-index --refresh &&
93
94 cd sub &&
Junio C Hamano9987d7c2007-02-21 14:31:10 -080095 git apply ../patch.file &&
Junio C Hamanofe6e0ee2007-02-21 16:18:45 -080096 check_result file1
Junio C Hamanoc24e9752007-02-21 01:14:22 -080097'
98
99test_expect_success 'same in subdir but with traditional patch input' '
100
101 cd "$D" &&
102 git config apply.whitespace strip &&
103 rm -f sub/file1 &&
104 cp saved sub/file1 &&
105 git update-index --refresh &&
106
107 cd sub &&
Junio C Hamano3e8a5db2007-02-21 16:05:56 -0800108 git apply ../gpatch.file &&
Junio C Hamanofe6e0ee2007-02-21 16:18:45 -0800109 check_result file1
Junio C Hamano3e8a5db2007-02-21 16:05:56 -0800110'
111
112test_expect_success 'same but with traditional patch input of depth 1' '
113
114 cd "$D" &&
115 git config apply.whitespace strip &&
116 rm -f sub/file1 &&
117 cp saved sub/file1 &&
118 git update-index --refresh &&
119
120 cd sub &&
121 git apply ../gpatch-sub.file &&
Junio C Hamanofe6e0ee2007-02-21 16:18:45 -0800122 check_result file1
Junio C Hamano3e8a5db2007-02-21 16:05:56 -0800123'
124
125test_expect_success 'same but with traditional patch input of depth 2' '
126
127 cd "$D" &&
128 git config apply.whitespace strip &&
129 rm -f sub/file1 &&
130 cp saved sub/file1 &&
131 git update-index --refresh &&
132
133 cd sub &&
134 git apply ../gpatch-ab-sub.file &&
Junio C Hamanofe6e0ee2007-02-21 16:18:45 -0800135 check_result file1
136'
137
138test_expect_success 'same but with traditional patch input of depth 1' '
139
140 cd "$D" &&
141 git config apply.whitespace strip &&
142 rm -f sub/file1 &&
143 cp saved sub/file1 &&
144 git update-index --refresh &&
145
146 git apply -p0 gpatch-sub.file &&
147 check_result sub/file1
148'
149
150test_expect_success 'same but with traditional patch input of depth 2' '
151
152 cd "$D" &&
153 git config apply.whitespace strip &&
154 rm -f sub/file1 &&
155 cp saved sub/file1 &&
156 git update-index --refresh &&
157
158 git apply gpatch-ab-sub.file &&
159 check_result sub/file1
Junio C Hamanodc7b2432007-02-17 13:12:52 -0800160'
161
Junio C Hamanod487b0b2014-08-06 14:26:24 -0700162test_expect_success 'in subdir with traditional patch input' '
163 cd "$D" &&
164 git config apply.whitespace strip &&
165 cat >.gitattributes <<-EOF &&
166 /* whitespace=blank-at-eol
167 sub/* whitespace=-blank-at-eol
168 EOF
169 rm -f sub/file1 &&
170 cp saved sub/file1 &&
171 git update-index --refresh &&
172
173 cd sub &&
174 git apply ../gpatch.file &&
175 echo "B " >expect &&
176 test_cmp expect file1
177'
178
Junio C Hamanodc7b2432007-02-17 13:12:52 -0800179test_done