1#!/bin/sh
2#
3# Copyright (c) 2007 Christian Couder
4#
5test_description='Tests git bisect functionality'
6
7exec </dev/null
8
9. ./test-lib.sh
10
11add_line_into_file()
12{
13 _line=$1
14 _file=$2
15
16 if [ -f "$_file" ]; then
17 echo "$_line" >> $_file || return $?
18 MSG="Add <$_line> into <$_file>."
19 else
20 echo "$_line" > $_file || return $?
21 git add $_file || return $?
22 MSG="Create file <$_file> with <$_line> inside."
23 fi
24
25 test_tick
26 git commit --quiet -m "$MSG" $_file
27}
28
29HASH1=
30HASH2=
31HASH3=
32HASH4=
33
34test_expect_success 'set up basic repo with 1 file (hello) and 4 commits' '
35 add_line_into_file "1: Hello World" hello &&
36 HASH1=$(git rev-parse --verify HEAD) &&
37 add_line_into_file "2: A new day for git" hello &&
38 HASH2=$(git rev-parse --verify HEAD) &&
39 add_line_into_file "3: Another new day for git" hello &&
40 HASH3=$(git rev-parse --verify HEAD) &&
41 add_line_into_file "4: Ciao for now" hello &&
42 HASH4=$(git rev-parse --verify HEAD)
43'
44
45test_expect_success 'bisect starts with only one bad' '
46 git bisect reset &&
47 git bisect start &&
48 git bisect bad $HASH4 &&
49 git bisect next
50'
51
52test_expect_success 'bisect does not start with only one good' '
53 git bisect reset &&
54 git bisect start &&
55 git bisect good $HASH1 || return 1
56
57 if git bisect next
58 then
59 echo Oops, should have failed.
60 false
61 else
62 :
63 fi
64'
65
66test_expect_success 'bisect start with one bad and good' '
67 git bisect reset &&
68 git bisect start &&
69 git bisect good $HASH1 &&
70 git bisect bad $HASH4 &&
71 git bisect next
72'
73
74test_expect_success 'bisect fails if given any junk instead of revs' '
75 git bisect reset &&
76 test_must_fail git bisect start foo $HASH1 -- &&
77 test_must_fail git bisect start $HASH4 $HASH1 bar -- &&
78 test -z "$(git for-each-ref "refs/bisect/*")" &&
79 test -z "$(ls .git/BISECT_* 2>/dev/null)" &&
80 git bisect start &&
81 test_must_fail git bisect good foo $HASH1 &&
82 test_must_fail git bisect good $HASH1 bar &&
83 test_must_fail git bisect bad frotz &&
84 test_must_fail git bisect bad $HASH3 $HASH4 &&
85 test_must_fail git bisect skip bar $HASH3 &&
86 test_must_fail git bisect skip $HASH1 foo &&
87 test -z "$(git for-each-ref "refs/bisect/*")" &&
88 git bisect good $HASH1 &&
89 git bisect bad $HASH4
90'
91
92test_expect_success 'bisect reset: back in the master branch' '
93 git bisect reset &&
94 echo "* master" > branch.expect &&
95 git branch > branch.output &&
96 cmp branch.expect branch.output
97'
98
99test_expect_success 'bisect reset: back in another branch' '
100 git checkout -b other &&
101 git bisect start &&
102 git bisect good $HASH1 &&
103 git bisect bad $HASH3 &&
104 git bisect reset &&
105 echo " master" > branch.expect &&
106 echo "* other" >> branch.expect &&
107 git branch > branch.output &&
108 cmp branch.expect branch.output
109'
110
111test_expect_success 'bisect reset when not bisecting' '
112 git bisect reset &&
113 git branch > branch.output &&
114 cmp branch.expect branch.output
115'
116
117test_expect_success 'bisect reset removes packed refs' '
118 git bisect reset &&
119 git bisect start &&
120 git bisect good $HASH1 &&
121 git bisect bad $HASH3 &&
122 git pack-refs --all --prune &&
123 git bisect next &&
124 git bisect reset &&
125 test -z "$(git for-each-ref "refs/bisect/*")" &&
126 test -z "$(git for-each-ref "refs/heads/bisect")"
127'
128
129test_expect_success 'bisect start: back in good branch' '
130 git branch > branch.output &&
131 grep "* other" branch.output > /dev/null &&
132 git bisect start $HASH4 $HASH1 -- &&
133 git bisect good &&
134 git bisect start $HASH4 $HASH1 -- &&
135 git bisect bad &&
136 git bisect reset &&
137 git branch > branch.output &&
138 grep "* other" branch.output > /dev/null
139'
140
141test_expect_success 'bisect start: no ".git/BISECT_START" if junk rev' '
142 git bisect start $HASH4 $HASH1 -- &&
143 git bisect good &&
144 test_must_fail git bisect start $HASH4 foo -- &&
145 git branch > branch.output &&
146 grep "* other" branch.output > /dev/null &&
147 test_must_fail test -e .git/BISECT_START
148'
149
150test_expect_success 'bisect start: no ".git/BISECT_START" if mistaken rev' '
151 git bisect start $HASH4 $HASH1 -- &&
152 git bisect good &&
153 test_must_fail git bisect start $HASH1 $HASH4 -- &&
154 git branch > branch.output &&
155 grep "* other" branch.output > /dev/null &&
156 test_must_fail test -e .git/BISECT_START
157'
158
159test_expect_success 'bisect start: no ".git/BISECT_START" if checkout error' '
160 echo "temp stuff" > hello &&
161 test_must_fail git bisect start $HASH4 $HASH1 -- &&
162 git branch &&
163 git branch > branch.output &&
164 grep "* other" branch.output > /dev/null &&
165 test_must_fail test -e .git/BISECT_START &&
166 test -z "$(git for-each-ref "refs/bisect/*")" &&
167 git checkout HEAD hello
168'
169
170# $HASH1 is good, $HASH4 is bad, we skip $HASH3
171# but $HASH2 is bad,
172# so we should find $HASH2 as the first bad commit
173test_expect_success 'bisect skip: successfull result' '
174 git bisect reset &&
175 git bisect start $HASH4 $HASH1 &&
176 git bisect skip &&
177 git bisect bad > my_bisect_log.txt &&
178 grep "$HASH2 is first bad commit" my_bisect_log.txt &&
179 git bisect reset
180'
181
182# $HASH1 is good, $HASH4 is bad, we skip $HASH3 and $HASH2
183# so we should not be able to tell the first bad commit
184# among $HASH2, $HASH3 and $HASH4
185test_expect_success 'bisect skip: cannot tell between 3 commits' '
186 git bisect start $HASH4 $HASH1 &&
187 git bisect skip || return 1
188
189 if git bisect skip > my_bisect_log.txt
190 then
191 echo Oops, should have failed.
192 false
193 else
194 test $? -eq 2 &&
195 grep "first bad commit could be any of" my_bisect_log.txt &&
196 ! grep $HASH1 my_bisect_log.txt &&
197 grep $HASH2 my_bisect_log.txt &&
198 grep $HASH3 my_bisect_log.txt &&
199 grep $HASH4 my_bisect_log.txt &&
200 git bisect reset
201 fi
202'
203
204# $HASH1 is good, $HASH4 is bad, we skip $HASH3
205# but $HASH2 is good,
206# so we should not be able to tell the first bad commit
207# among $HASH3 and $HASH4
208test_expect_success 'bisect skip: cannot tell between 2 commits' '
209 git bisect start $HASH4 $HASH1 &&
210 git bisect skip || return 1
211
212 if git bisect good > my_bisect_log.txt
213 then
214 echo Oops, should have failed.
215 false
216 else
217 test $? -eq 2 &&
218 grep "first bad commit could be any of" my_bisect_log.txt &&
219 ! grep $HASH1 my_bisect_log.txt &&
220 ! grep $HASH2 my_bisect_log.txt &&
221 grep $HASH3 my_bisect_log.txt &&
222 grep $HASH4 my_bisect_log.txt &&
223 git bisect reset
224 fi
225'
226
227# We want to automatically find the commit that
228# introduced "Another" into hello.
229test_expect_success \
230 '"git bisect run" simple case' \
231 'echo "#"\!"/bin/sh" > test_script.sh &&
232 echo "grep Another hello > /dev/null" >> test_script.sh &&
233 echo "test \$? -ne 0" >> test_script.sh &&
234 chmod +x test_script.sh &&
235 git bisect start &&
236 git bisect good $HASH1 &&
237 git bisect bad $HASH4 &&
238 git bisect run ./test_script.sh > my_bisect_log.txt &&
239 grep "$HASH3 is first bad commit" my_bisect_log.txt &&
240 git bisect reset'
241
242# We want to automatically find the commit that
243# introduced "Ciao" into hello.
244test_expect_success \
245 '"git bisect run" with more complex "git bisect start"' \
246 'echo "#"\!"/bin/sh" > test_script.sh &&
247 echo "grep Ciao hello > /dev/null" >> test_script.sh &&
248 echo "test \$? -ne 0" >> test_script.sh &&
249 chmod +x test_script.sh &&
250 git bisect start $HASH4 $HASH1 &&
251 git bisect run ./test_script.sh > my_bisect_log.txt &&
252 grep "$HASH4 is first bad commit" my_bisect_log.txt &&
253 git bisect reset'
254
255# $HASH1 is good, $HASH5 is bad, we skip $HASH3
256# but $HASH4 is good,
257# so we should find $HASH5 as the first bad commit
258HASH5=
259test_expect_success 'bisect skip: add line and then a new test' '
260 add_line_into_file "5: Another new line." hello &&
261 HASH5=$(git rev-parse --verify HEAD) &&
262 git bisect start $HASH5 $HASH1 &&
263 git bisect skip &&
264 git bisect good > my_bisect_log.txt &&
265 grep "$HASH5 is first bad commit" my_bisect_log.txt &&
266 git bisect log > log_to_replay.txt &&
267 git bisect reset
268'
269
270test_expect_success 'bisect skip and bisect replay' '
271 git bisect replay log_to_replay.txt > my_bisect_log.txt &&
272 grep "$HASH5 is first bad commit" my_bisect_log.txt &&
273 git bisect reset
274'
275
276HASH6=
277test_expect_success 'bisect run & skip: cannot tell between 2' '
278 add_line_into_file "6: Yet a line." hello &&
279 HASH6=$(git rev-parse --verify HEAD) &&
280 echo "#"\!"/bin/sh" > test_script.sh &&
281 echo "sed -ne \\\$p hello | grep Ciao > /dev/null && exit 125" >> test_script.sh &&
282 echo "grep line hello > /dev/null" >> test_script.sh &&
283 echo "test \$? -ne 0" >> test_script.sh &&
284 chmod +x test_script.sh &&
285 git bisect start $HASH6 $HASH1 &&
286 if git bisect run ./test_script.sh > my_bisect_log.txt
287 then
288 echo Oops, should have failed.
289 false
290 else
291 test $? -eq 2 &&
292 grep "first bad commit could be any of" my_bisect_log.txt &&
293 ! grep $HASH3 my_bisect_log.txt &&
294 ! grep $HASH6 my_bisect_log.txt &&
295 grep $HASH4 my_bisect_log.txt &&
296 grep $HASH5 my_bisect_log.txt
297 fi
298'
299
300HASH7=
301test_expect_success 'bisect run & skip: find first bad' '
302 git bisect reset &&
303 add_line_into_file "7: Should be the last line." hello &&
304 HASH7=$(git rev-parse --verify HEAD) &&
305 echo "#"\!"/bin/sh" > test_script.sh &&
306 echo "sed -ne \\\$p hello | grep Ciao > /dev/null && exit 125" >> test_script.sh &&
307 echo "sed -ne \\\$p hello | grep day > /dev/null && exit 125" >> test_script.sh &&
308 echo "grep Yet hello > /dev/null" >> test_script.sh &&
309 echo "test \$? -ne 0" >> test_script.sh &&
310 chmod +x test_script.sh &&
311 git bisect start $HASH7 $HASH1 &&
312 git bisect run ./test_script.sh > my_bisect_log.txt &&
313 grep "$HASH6 is first bad commit" my_bisect_log.txt
314'
315
316test_expect_success 'bisect starting with a detached HEAD' '
317
318 git bisect reset &&
319 git checkout master^ &&
320 HEAD=$(git rev-parse --verify HEAD) &&
321 git bisect start &&
322 test $HEAD = $(cat .git/BISECT_START) &&
323 git bisect reset &&
324 test $HEAD = $(git rev-parse --verify HEAD)
325'
326
327test_expect_success 'bisect errors out if bad and good are mistaken' '
328 git bisect reset &&
329 test_must_fail git bisect start $HASH2 $HASH4 2> rev_list_error &&
330 grep "mistake good and bad" rev_list_error &&
331 git bisect reset
332'
333
334test_expect_success 'bisect does not create a "bisect" branch' '
335 git bisect reset &&
336 git bisect start $HASH7 $HASH1 &&
337 git branch bisect &&
338 rev_hash4=$(git rev-parse --verify HEAD) &&
339 test "$rev_hash4" = "$HASH4" &&
340 git branch -D bisect &&
341 git bisect good &&
342 git branch bisect &&
343 rev_hash6=$(git rev-parse --verify HEAD) &&
344 test "$rev_hash6" = "$HASH6" &&
345 git bisect good > my_bisect_log.txt &&
346 grep "$HASH7 is first bad commit" my_bisect_log.txt &&
347 git bisect reset &&
348 rev_hash6=$(git rev-parse --verify bisect) &&
349 test "$rev_hash6" = "$HASH6" &&
350 git branch -D bisect
351'
352
353# This creates a "side" branch to test "siblings" cases.
354#
355# H1-H2-H3-H4-H5-H6-H7 <--other
356# \
357# S5-S6-S7 <--side
358#
359test_expect_success 'side branch creation' '
360 git bisect reset &&
361 git checkout -b side $HASH4 &&
362 add_line_into_file "5(side): first line on a side branch" hello2 &&
363 SIDE_HASH5=$(git rev-parse --verify HEAD) &&
364 add_line_into_file "6(side): second line on a side branch" hello2 &&
365 SIDE_HASH6=$(git rev-parse --verify HEAD) &&
366 add_line_into_file "7(side): third line on a side branch" hello2 &&
367 SIDE_HASH7=$(git rev-parse --verify HEAD)
368'
369
370test_expect_success 'good merge base when good and bad are siblings' '
371 git bisect start "$HASH7" "$SIDE_HASH7" > my_bisect_log.txt &&
372 grep "merge base must be tested" my_bisect_log.txt &&
373 grep $HASH4 my_bisect_log.txt &&
374 git bisect good > my_bisect_log.txt &&
375 test_must_fail grep "merge base must be tested" my_bisect_log.txt &&
376 grep $HASH6 my_bisect_log.txt &&
377 git bisect reset
378'
379test_expect_success 'skipped merge base when good and bad are siblings' '
380 git bisect start "$SIDE_HASH7" "$HASH7" > my_bisect_log.txt &&
381 grep "merge base must be tested" my_bisect_log.txt &&
382 grep $HASH4 my_bisect_log.txt &&
383 git bisect skip > my_bisect_log.txt 2>&1 &&
384 grep "Warning" my_bisect_log.txt &&
385 grep $SIDE_HASH6 my_bisect_log.txt &&
386 git bisect reset
387'
388
389test_expect_success 'bad merge base when good and bad are siblings' '
390 git bisect start "$HASH7" HEAD > my_bisect_log.txt &&
391 grep "merge base must be tested" my_bisect_log.txt &&
392 grep $HASH4 my_bisect_log.txt &&
393 test_must_fail git bisect bad > my_bisect_log.txt 2>&1 &&
394 grep "merge base $HASH4 is bad" my_bisect_log.txt &&
395 grep "fixed between $HASH4 and \[$SIDE_HASH7\]" my_bisect_log.txt &&
396 git bisect reset
397'
398
399# This creates a few more commits (A and B) to test "siblings" cases
400# when a good and a bad rev have many merge bases.
401#
402# We should have the following:
403#
404# H1-H2-H3-H4-H5-H6-H7
405# \ \ \
406# S5-A \
407# \ \
408# S6-S7----B
409#
410# And there A and B have 2 merge bases (S5 and H5) that should be
411# reported by "git merge-base --all A B".
412#
413test_expect_success 'many merge bases creation' '
414 git checkout "$SIDE_HASH5" &&
415 git merge -m "merge HASH5 and SIDE_HASH5" "$HASH5" &&
416 A_HASH=$(git rev-parse --verify HEAD) &&
417 git checkout side &&
418 git merge -m "merge HASH7 and SIDE_HASH7" "$HASH7" &&
419 B_HASH=$(git rev-parse --verify HEAD) &&
420 git merge-base --all "$A_HASH" "$B_HASH" > merge_bases.txt &&
421 test $(wc -l < merge_bases.txt) = "2" &&
422 grep "$HASH5" merge_bases.txt &&
423 grep "$SIDE_HASH5" merge_bases.txt
424'
425
426test_expect_success 'good merge bases when good and bad are siblings' '
427 git bisect start "$B_HASH" "$A_HASH" > my_bisect_log.txt &&
428 grep "merge base must be tested" my_bisect_log.txt &&
429 git bisect good > my_bisect_log2.txt &&
430 grep "merge base must be tested" my_bisect_log2.txt &&
431 {
432 {
433 grep "$SIDE_HASH5" my_bisect_log.txt &&
434 grep "$HASH5" my_bisect_log2.txt
435 } || {
436 grep "$SIDE_HASH5" my_bisect_log2.txt &&
437 grep "$HASH5" my_bisect_log.txt
438 }
439 } &&
440 git bisect reset
441'
442
443check_trace() {
444 grep "$1" "$GIT_TRACE" | grep "\^$2" | grep "$3" >/dev/null
445}
446
447test_expect_success 'optimized merge base checks' '
448 GIT_TRACE="$(pwd)/trace.log" &&
449 export GIT_TRACE &&
450 git bisect start "$HASH7" "$SIDE_HASH7" > my_bisect_log.txt &&
451 grep "merge base must be tested" my_bisect_log.txt &&
452 grep "$HASH4" my_bisect_log.txt &&
453 check_trace "rev-list" "$HASH7" "$SIDE_HASH7" &&
454 git bisect good > my_bisect_log2.txt &&
455 test -f ".git/BISECT_ANCESTORS_OK" &&
456 test "$HASH6" = $(git rev-parse --verify HEAD) &&
457 : > "$GIT_TRACE" &&
458 git bisect bad > my_bisect_log3.txt &&
459 test_must_fail check_trace "rev-list" "$HASH6" "$SIDE_HASH7" &&
460 git bisect good "$A_HASH" > my_bisect_log4.txt &&
461 grep "merge base must be tested" my_bisect_log4.txt &&
462 test_must_fail test -f ".git/BISECT_ANCESTORS_OK" &&
463 check_trace "rev-list" "$HASH6" "$A_HASH" &&
464 unset GIT_TRACE
465'
466
467#
468#
469test_done