]>
Commit | Line | Data |
---|---|---|
c2a06369 JH |
1 | #!/bin/sh |
2 | ||
3 | test_description='git blame corner cases' | |
4 | . ./test-lib.sh | |
5 | ||
6 | pick_fc='s/^[0-9a-f^]* *\([^ ]*\) *(\([^ ]*\) .*/\1-\2/' | |
7 | ||
8 | test_expect_success setup ' | |
9 | ||
10 | echo A A A A A >one && | |
11 | echo B B B B B >two && | |
12 | echo C C C C C >tres && | |
13 | echo ABC >mouse && | |
00fb3d21 RS |
14 | for i in 1 2 3 4 5 6 7 8 9 |
15 | do | |
16 | echo $i | |
17 | done >nine_lines && | |
18 | for i in 1 2 3 4 5 6 7 8 9 a | |
19 | do | |
20 | echo $i | |
21 | done >ten_lines && | |
22 | git add one two tres mouse nine_lines ten_lines && | |
c2a06369 JH |
23 | test_tick && |
24 | GIT_AUTHOR_NAME=Initial git commit -m Initial && | |
25 | ||
26 | cat one >uno && | |
27 | mv two dos && | |
28 | cat one >>tres && | |
99094a7a | 29 | echo DEF >>mouse && |
c2a06369 JH |
30 | git add uno dos tres mouse && |
31 | test_tick && | |
32 | GIT_AUTHOR_NAME=Second git commit -a -m Second && | |
33 | ||
34 | echo GHIJK >>mouse && | |
35 | git add mouse && | |
36 | test_tick && | |
37 | GIT_AUTHOR_NAME=Third git commit -m Third && | |
38 | ||
39 | cat mouse >cow && | |
40 | git add cow && | |
41 | test_tick && | |
42 | GIT_AUTHOR_NAME=Fourth git commit -m Fourth && | |
43 | ||
c66b4700 MH |
44 | cat >cow <<-\EOF && |
45 | ABC | |
46 | DEF | |
47 | XXXX | |
48 | GHIJK | |
49 | EOF | |
c2a06369 JH |
50 | git add cow && |
51 | test_tick && | |
52 | GIT_AUTHOR_NAME=Fifth git commit -m Fifth | |
53 | ' | |
54 | ||
55 | test_expect_success 'straight copy without -C' ' | |
56 | ||
57 | git blame uno | grep Second | |
58 | ||
59 | ' | |
60 | ||
61 | test_expect_success 'straight move without -C' ' | |
62 | ||
63 | git blame dos | grep Initial | |
64 | ||
65 | ' | |
66 | ||
67 | test_expect_success 'straight copy with -C' ' | |
68 | ||
69 | git blame -C1 uno | grep Second | |
70 | ||
71 | ' | |
72 | ||
73 | test_expect_success 'straight move with -C' ' | |
74 | ||
75 | git blame -C1 dos | grep Initial | |
76 | ||
77 | ' | |
78 | ||
79 | test_expect_success 'straight copy with -C -C' ' | |
80 | ||
81 | git blame -C -C1 uno | grep Initial | |
82 | ||
83 | ' | |
84 | ||
85 | test_expect_success 'straight move with -C -C' ' | |
86 | ||
87 | git blame -C -C1 dos | grep Initial | |
88 | ||
89 | ' | |
90 | ||
91 | test_expect_success 'append without -C' ' | |
92 | ||
93 | git blame -L2 tres | grep Second | |
94 | ||
95 | ' | |
96 | ||
97 | test_expect_success 'append with -C' ' | |
98 | ||
99 | git blame -L2 -C1 tres | grep Second | |
100 | ||
101 | ' | |
102 | ||
103 | test_expect_success 'append with -C -C' ' | |
104 | ||
105 | git blame -L2 -C -C1 tres | grep Second | |
106 | ||
107 | ' | |
108 | ||
109 | test_expect_success 'append with -C -C -C' ' | |
110 | ||
111 | git blame -L2 -C -C -C1 tres | grep Initial | |
112 | ||
113 | ' | |
114 | ||
115 | test_expect_success 'blame wholesale copy' ' | |
116 | ||
117 | git blame -f -C -C1 HEAD^ -- cow | sed -e "$pick_fc" >current && | |
c66b4700 MH |
118 | cat >expected <<-\EOF && |
119 | mouse-Initial | |
120 | mouse-Second | |
121 | mouse-Third | |
122 | EOF | |
82ebb0b6 | 123 | test_cmp expected current |
c2a06369 JH |
124 | |
125 | ' | |
126 | ||
127 | test_expect_success 'blame wholesale copy and more' ' | |
128 | ||
129 | git blame -f -C -C1 HEAD -- cow | sed -e "$pick_fc" >current && | |
c66b4700 MH |
130 | cat >expected <<-\EOF && |
131 | mouse-Initial | |
132 | mouse-Second | |
133 | cow-Fifth | |
134 | mouse-Third | |
135 | EOF | |
82ebb0b6 | 136 | test_cmp expected current |
c2a06369 JH |
137 | |
138 | ' | |
139 | ||
3b75ee93 MH |
140 | test_expect_success 'blame wholesale copy and more in the index' ' |
141 | ||
142 | cat >horse <<-\EOF && | |
143 | ABC | |
144 | DEF | |
145 | XXXX | |
146 | YYYY | |
147 | GHIJK | |
148 | EOF | |
149 | git add horse && | |
150 | test_when_finished "git rm -f horse" && | |
151 | git blame -f -C -C1 -- horse | sed -e "$pick_fc" >current && | |
152 | cat >expected <<-\EOF && | |
153 | mouse-Initial | |
154 | mouse-Second | |
155 | cow-Fifth | |
156 | horse-Not | |
157 | mouse-Third | |
158 | EOF | |
159 | test_cmp expected current | |
160 | ||
161 | ' | |
162 | ||
163 | test_expect_success 'blame during cherry-pick with file rename conflict' ' | |
164 | ||
165 | test_when_finished "git reset --hard && git checkout master" && | |
166 | git checkout HEAD~3 && | |
167 | echo MOUSE >> mouse && | |
168 | git mv mouse rodent && | |
169 | git add rodent && | |
170 | GIT_AUTHOR_NAME=Rodent git commit -m "rodent" && | |
171 | git checkout --detach master && | |
172 | (git cherry-pick HEAD@{1} || test $? -eq 1) && | |
173 | git show HEAD@{1}:rodent > rodent && | |
174 | git add rodent && | |
175 | git blame -f -C -C1 rodent | sed -e "$pick_fc" >current && | |
3b75ee93 MH |
176 | cat >expected <<-\EOF && |
177 | mouse-Initial | |
178 | mouse-Second | |
179 | rodent-Not | |
180 | EOF | |
181 | test_cmp expected current | |
182 | ' | |
183 | ||
a9b2d424 JH |
184 | test_expect_success 'blame path that used to be a directory' ' |
185 | mkdir path && | |
186 | echo A A A A A >path/file && | |
187 | echo B B B B B >path/elif && | |
188 | git add path && | |
189 | test_tick && | |
190 | git commit -m "path was a directory" && | |
191 | rm -fr path && | |
192 | echo A A A A A >path && | |
193 | git add path && | |
194 | test_tick && | |
195 | git commit -m "path is a regular file" && | |
196 | git blame HEAD^.. -- path | |
197 | ' | |
198 | ||
c8cba791 | 199 | test_expect_success 'blame to a commit with no author name' ' |
844116d9 | 200 | TREE=$(git rev-parse HEAD:) && |
99094a7a | 201 | cat >badcommit <<EOF && |
c8cba791 DR |
202 | tree $TREE |
203 | author <noname> 1234567890 +0000 | |
204 | committer David Reiss <dreiss@facebook.com> 1234567890 +0000 | |
205 | ||
206 | some message | |
207 | EOF | |
844116d9 | 208 | COMMIT=$(git hash-object -t commit -w badcommit) && |
c8cba791 DR |
209 | git --no-pager blame $COMMIT -- uno >/dev/null |
210 | ' | |
211 | ||
92f9e273 | 212 | test_expect_success 'blame -L with invalid start' ' |
33f0ea42 | 213 | test_must_fail git blame -L5 tres 2>errors && |
e3f54bff | 214 | test_i18ngrep "has only 2 lines" errors |
92f9e273 JS |
215 | ' |
216 | ||
217 | test_expect_success 'blame -L with invalid end' ' | |
96cfa94e IS |
218 | git blame -L1,5 tres >out && |
219 | test_line_count = 2 out | |
92f9e273 JS |
220 | ' |
221 | ||
25ed3412 BY |
222 | test_expect_success 'blame parses <end> part of -L' ' |
223 | git blame -L1,1 tres >out && | |
96cfa94e IS |
224 | test_line_count = 1 out |
225 | ' | |
226 | ||
227 | test_expect_success 'blame -Ln,-(n+1)' ' | |
228 | git blame -L3,-4 nine_lines >out && | |
229 | test_line_count = 3 out | |
25ed3412 BY |
230 | ' |
231 | ||
00fb3d21 RS |
232 | test_expect_success 'indent of line numbers, nine lines' ' |
233 | git blame nine_lines >actual && | |
234 | test $(grep -c " " actual) = 0 | |
235 | ' | |
236 | ||
237 | test_expect_success 'indent of line numbers, ten lines' ' | |
238 | git blame ten_lines >actual && | |
239 | test $(grep -c " " actual) = 9 | |
240 | ' | |
241 | ||
4bf256d6 | 242 | test_expect_success 'setup file with CRLF newlines' ' |
4d4813a5 | 243 | git config core.autocrlf false && |
4bf256d6 | 244 | printf "testcase\n" >crlffile && |
4d4813a5 | 245 | git add crlffile && |
246 | git commit -m testcase && | |
4bf256d6 TB |
247 | printf "testcase\r\n" >crlffile |
248 | ' | |
249 | ||
250 | test_expect_success 'blame file with CRLF core.autocrlf true' ' | |
251 | git config core.autocrlf true && | |
252 | git blame crlffile >actual && | |
253 | grep "A U Thor" actual | |
254 | ' | |
255 | ||
256 | test_expect_success 'blame file with CRLF attributes text' ' | |
257 | git config core.autocrlf false && | |
258 | echo "crlffile text" >.gitattributes && | |
259 | git blame crlffile >actual && | |
4d4813a5 | 260 | grep "A U Thor" actual |
261 | ' | |
262 | ||
a08feb8e TB |
263 | test_expect_success 'blame file with CRLF core.autocrlf=true' ' |
264 | git config core.autocrlf false && | |
265 | printf "testcase\r\n" >crlfinrepo && | |
266 | >.gitattributes && | |
267 | git add crlfinrepo && | |
268 | git commit -m "add crlfinrepo" && | |
269 | git config core.autocrlf true && | |
270 | mv crlfinrepo tmp && | |
271 | git checkout crlfinrepo && | |
272 | rm tmp && | |
273 | git blame crlfinrepo >actual && | |
274 | grep "A U Thor" actual | |
275 | ' | |
276 | ||
f0cbe742 BR |
277 | # Tests the splitting and merging of blame entries in blame_coalesce(). |
278 | # The output of blame is the same, regardless of whether blame_coalesce() runs | |
279 | # or not, so we'd likely only notice a problem if blame crashes or assigned | |
280 | # blame to the "splitting" commit ('SPLIT' below). | |
281 | test_expect_success 'blame coalesce' ' | |
282 | cat >giraffe <<-\EOF && | |
283 | ABC | |
284 | DEF | |
285 | EOF | |
286 | git add giraffe && | |
287 | git commit -m "original file" && | |
288 | oid=$(git rev-parse HEAD) && | |
289 | ||
290 | cat >giraffe <<-\EOF && | |
291 | ABC | |
292 | SPLIT | |
293 | DEF | |
294 | EOF | |
295 | git add giraffe && | |
296 | git commit -m "interior SPLIT line" && | |
297 | ||
298 | cat >giraffe <<-\EOF && | |
299 | ABC | |
300 | DEF | |
301 | EOF | |
302 | git add giraffe && | |
303 | git commit -m "same contents as original" && | |
304 | ||
305 | cat >expect <<-EOF && | |
306 | $oid 1) ABC | |
307 | $oid 2) DEF | |
308 | EOF | |
309 | git -c core.abbrev=40 blame -s giraffe >actual && | |
310 | test_cmp expect actual | |
311 | ' | |
312 | ||
c2a06369 | 313 | test_done |