]>
Commit | Line | Data |
---|---|---|
8cc6a083 | 1 | #!/bin/sh |
d025524d | 2 | |
243a60fb CC |
3 | USAGE='[help|start|bad|good|skip|next|reset|visualize|replay|log|run]' |
4 | LONG_USAGE='git bisect help | |
5 | print this long help message. | |
6 | git bisect start [<bad> [<good>...]] [--] [<pathspec>...] | |
38a47fd6 CC |
7 | reset bisect state and start bisection. |
8 | git bisect bad [<rev>] | |
9 | mark <rev> a known-bad revision. | |
10 | git bisect good [<rev>...] | |
11 | mark <rev>... known-good revisions. | |
6ca8b977 CC |
12 | git bisect skip [<rev>...] |
13 | mark <rev>... untestable revisions. | |
38a47fd6 CC |
14 | git bisect next |
15 | find next bisection to test and check it out. | |
16 | git bisect reset [<branch>] | |
17 | finish bisection search and go back to branch. | |
18 | git bisect visualize | |
19 | show bisect status in gitk. | |
20 | git bisect replay <logfile> | |
21 | replay bisection log. | |
22 | git bisect log | |
23 | show bisect log. | |
24 | git bisect run <cmd>... | |
243a60fb CC |
25 | use <cmd>... to automatically bisect. |
26 | ||
27 | Please use "git help bisect" to get the full man page.' | |
d025524d | 28 | |
8f321a39 | 29 | OPTIONS_SPEC= |
ae2b0f15 | 30 | . git-sh-setup |
4c550686 | 31 | require_work_tree |
8cc6a083 | 32 | |
ce32660e JS |
33 | _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' |
34 | _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" | |
35 | ||
e9a45d75 | 36 | sq() { |
d9bffc08 | 37 | @@PERL@@ -e ' |
e9a45d75 JH |
38 | for (@ARGV) { |
39 | s/'\''/'\'\\\\\'\''/g; | |
40 | print " '\''$_'\''"; | |
41 | } | |
42 | print "\n"; | |
43 | ' "$@" | |
44 | } | |
45 | ||
8cc6a083 | 46 | bisect_autostart() { |
823ea121 | 47 | test -s "$GIT_DIR/BISECT_START" || { |
8cc6a083 LT |
48 | echo >&2 'You need to start by "git bisect start"' |
49 | if test -t 0 | |
50 | then | |
51 | echo >&2 -n 'Do you want me to do it for you [Y/n]? ' | |
52 | read yesno | |
53 | case "$yesno" in | |
54 | [Nn]*) | |
55 | exit ;; | |
56 | esac | |
57 | bisect_start | |
58 | else | |
59 | exit 1 | |
60 | fi | |
61 | } | |
62 | } | |
63 | ||
64 | bisect_start() { | |
8cc6a083 | 65 | # |
634f2464 | 66 | # Verify HEAD. |
8cc6a083 | 67 | # |
48949a18 | 68 | head=$(GIT_DIR="$GIT_DIR" git symbolic-ref -q HEAD) || |
ce32660e JS |
69 | head=$(GIT_DIR="$GIT_DIR" git rev-parse --verify HEAD) || |
70 | die "Bad HEAD - I need a HEAD" | |
634f2464 | 71 | |
ee831f7d | 72 | # |
634f2464 | 73 | # Check if we are bisecting. |
ee831f7d | 74 | # |
d3e54c88 | 75 | start_head='' |
634f2464 CC |
76 | if test -s "$GIT_DIR/BISECT_START" |
77 | then | |
78 | # Reset to the rev from where we started. | |
9d0cd91c CC |
79 | start_head=$(cat "$GIT_DIR/BISECT_START") |
80 | git checkout "$start_head" || exit | |
634f2464 CC |
81 | else |
82 | # Get rev from where we start. | |
83 | case "$head" in | |
84 | refs/heads/*|$_x40) | |
85 | # This error message should only be triggered by | |
86 | # cogito usage, and cogito users should understand | |
87 | # it relates to cg-seek. | |
88 | [ -s "$GIT_DIR/head-name" ] && | |
89 | die "won't bisect on seeked tree" | |
90 | start_head="${head#refs/heads/}" | |
91 | ;; | |
92 | *) | |
93 | die "Bad HEAD - strange symbolic ref" | |
94 | ;; | |
95 | esac | |
96 | fi | |
8cc6a083 LT |
97 | |
98 | # | |
634f2464 | 99 | # Get rid of any old bisect state. |
8cc6a083 | 100 | # |
823ea121 | 101 | bisect_clean_state || exit |
38a47fd6 CC |
102 | |
103 | # | |
104 | # Check for one bad and then some good revisions. | |
105 | # | |
106 | has_double_dash=0 | |
107 | for arg; do | |
108 | case "$arg" in --) has_double_dash=1; break ;; esac | |
109 | done | |
110 | orig_args=$(sq "$@") | |
111 | bad_seen=0 | |
d3e54c88 | 112 | eval='' |
38a47fd6 CC |
113 | while [ $# -gt 0 ]; do |
114 | arg="$1" | |
115 | case "$arg" in | |
116 | --) | |
8fe26f44 | 117 | shift |
38a47fd6 CC |
118 | break |
119 | ;; | |
120 | *) | |
634f2464 | 121 | rev=$(git rev-parse -q --verify "$arg^{commit}") || { |
38a47fd6 CC |
122 | test $has_double_dash -eq 1 && |
123 | die "'$arg' does not appear to be a valid revision" | |
124 | break | |
125 | } | |
737c74ee CC |
126 | case $bad_seen in |
127 | 0) state='bad' ; bad_seen=1 ;; | |
128 | *) state='good' ;; | |
129 | esac | |
d3e54c88 | 130 | eval="$eval bisect_write '$state' '$rev' 'nolog'; " |
8fe26f44 | 131 | shift |
38a47fd6 CC |
132 | ;; |
133 | esac | |
8fe26f44 | 134 | done |
38a47fd6 | 135 | |
ba963de8 CC |
136 | # |
137 | # Change state. | |
138 | # In case of mistaken revs or checkout error, or signals received, | |
139 | # "bisect_auto_next" below may exit or misbehave. | |
140 | # We have to trap this to be able to clean up using | |
141 | # "bisect_clean_state". | |
142 | # | |
143 | trap 'bisect_clean_state' 0 | |
144 | trap 'exit 255' 1 2 3 15 | |
145 | ||
146 | # | |
147 | # Write new start state. | |
148 | # | |
ba963de8 | 149 | echo "$start_head" >"$GIT_DIR/BISECT_START" && |
823ea121 | 150 | sq "$@" >"$GIT_DIR/BISECT_NAMES" && |
ba963de8 | 151 | eval "$eval" && |
6c98c054 | 152 | echo "git bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG" || exit |
ba963de8 CC |
153 | # |
154 | # Check if we can proceed to the next bisect state. | |
155 | # | |
38a47fd6 | 156 | bisect_auto_next |
ba963de8 CC |
157 | |
158 | trap '-' 0 | |
8cc6a083 LT |
159 | } |
160 | ||
55624f9a CC |
161 | bisect_write() { |
162 | state="$1" | |
163 | rev="$2" | |
737c74ee | 164 | nolog="$3" |
55624f9a CC |
165 | case "$state" in |
166 | bad) tag="$state" ;; | |
167 | good|skip) tag="$state"-"$rev" ;; | |
168 | *) die "Bad bisect_write argument: $state" ;; | |
169 | esac | |
ba963de8 | 170 | git update-ref "refs/bisect/$tag" "$rev" || exit |
f454cdc4 | 171 | echo "# $state: $(git show-branch $rev)" >>"$GIT_DIR/BISECT_LOG" |
6c98c054 | 172 | test -n "$nolog" || echo "git bisect $state $rev" >>"$GIT_DIR/BISECT_LOG" |
55624f9a CC |
173 | } |
174 | ||
c9c4e2d5 CC |
175 | is_expected_rev() { |
176 | test -f "$GIT_DIR/BISECT_EXPECTED_REV" && | |
177 | test "$1" = $(cat "$GIT_DIR/BISECT_EXPECTED_REV") | |
178 | } | |
179 | ||
180 | mark_expected_rev() { | |
181 | echo "$1" > "$GIT_DIR/BISECT_EXPECTED_REV" | |
182 | } | |
183 | ||
184 | check_expected_revs() { | |
185 | for _rev in "$@"; do | |
186 | if ! is_expected_rev "$_rev"; then | |
187 | rm -f "$GIT_DIR/BISECT_ANCESTORS_OK" | |
188 | rm -f "$GIT_DIR/BISECT_EXPECTED_REV" | |
189 | return | |
190 | fi | |
191 | done | |
192 | } | |
193 | ||
ee2314f5 CC |
194 | bisect_skip() { |
195 | all='' | |
196 | for arg in "$@" | |
197 | do | |
198 | case "$arg" in | |
199 | *..*) | |
200 | revs=$(git rev-list "$arg") || die "Bad rev input: $arg" ;; | |
201 | *) | |
1a66a489 | 202 | revs=$(sq "$arg") ;; |
ee2314f5 CC |
203 | esac |
204 | all="$all $revs" | |
205 | done | |
1a66a489 | 206 | eval bisect_state 'skip' $all |
ee2314f5 CC |
207 | } |
208 | ||
155fc795 | 209 | bisect_state() { |
8cc6a083 | 210 | bisect_autostart |
155fc795 CC |
211 | state=$1 |
212 | case "$#,$state" in | |
213 | 0,*) | |
214 | die "Please call 'bisect_state' with at least one argument." ;; | |
215 | 1,bad|1,good|1,skip) | |
216 | rev=$(git rev-parse --verify HEAD) || | |
217 | die "Bad rev input: HEAD" | |
c9c4e2d5 CC |
218 | bisect_write "$state" "$rev" |
219 | check_expected_revs "$rev" ;; | |
e3389075 | 220 | 2,bad|*,good|*,skip) |
155fc795 | 221 | shift |
d3e54c88 | 222 | eval='' |
e3389075 | 223 | for rev in "$@" |
155fc795 | 224 | do |
a179a303 | 225 | sha=$(git rev-parse --verify "$rev^{commit}") || |
e3389075 | 226 | die "Bad rev input: $rev" |
d3e54c88 CC |
227 | eval="$eval bisect_write '$state' '$sha'; " |
228 | done | |
c9c4e2d5 CC |
229 | eval "$eval" |
230 | check_expected_revs "$@" ;; | |
e3389075 CC |
231 | *,bad) |
232 | die "'git bisect bad' can take only one argument." ;; | |
cc9f24d0 JH |
233 | *) |
234 | usage ;; | |
8cc6a083 | 235 | esac |
97e1c51e CC |
236 | bisect_auto_next |
237 | } | |
238 | ||
8cc6a083 | 239 | bisect_next_check() { |
0a5280a9 JH |
240 | missing_good= missing_bad= |
241 | git show-ref -q --verify refs/bisect/bad || missing_bad=t | |
242 | test -n "$(git for-each-ref "refs/bisect/good-*")" || missing_good=t | |
6fecf191 | 243 | |
0a5280a9 JH |
244 | case "$missing_good,$missing_bad,$1" in |
245 | ,,*) | |
246 | : have both good and bad - ok | |
247 | ;; | |
248 | *,) | |
249 | # do not have both but not asked to fail - just report. | |
250 | false | |
251 | ;; | |
252 | t,,good) | |
253 | # have bad but not good. we could bisect although | |
254 | # this is less optimum. | |
255 | echo >&2 'Warning: bisecting only with a bad commit.' | |
256 | if test -t 0 | |
257 | then | |
258 | printf >&2 'Are you sure [Y/n]? ' | |
e5d3afd7 FM |
259 | read yesno |
260 | case "$yesno" in [Nn]*) exit 1 ;; esac | |
0a5280a9 JH |
261 | fi |
262 | : bisect without good... | |
263 | ;; | |
8cc6a083 | 264 | *) |
0a5280a9 | 265 | THEN='' |
823ea121 | 266 | test -s "$GIT_DIR/BISECT_START" || { |
0a5280a9 JH |
267 | echo >&2 'You need to start by "git bisect start".' |
268 | THEN='then ' | |
269 | } | |
270 | echo >&2 'You '$THEN'need to give me at least one good' \ | |
271 | 'and one bad revisions.' | |
272 | echo >&2 '(You can use "git bisect bad" and' \ | |
273 | '"git bisect good" for that.)' | |
274 | exit 1 ;; | |
8cc6a083 LT |
275 | esac |
276 | } | |
277 | ||
278 | bisect_auto_next() { | |
434d036f | 279 | bisect_next_check && bisect_next || : |
8cc6a083 LT |
280 | } |
281 | ||
97e1c51e CC |
282 | filter_skipped() { |
283 | _eval="$1" | |
284 | _skip="$2" | |
285 | ||
286 | if [ -z "$_skip" ]; then | |
f821d089 | 287 | eval "$_eval" |
97e1c51e CC |
288 | return |
289 | fi | |
290 | ||
291 | # Let's parse the output of: | |
292 | # "git rev-list --bisect-vars --bisect-all ..." | |
f821d089 | 293 | eval "$_eval" | while read hash line |
97e1c51e CC |
294 | do |
295 | case "$VARS,$FOUND,$TRIED,$hash" in | |
296 | # We display some vars. | |
297 | 1,*,*,*) echo "$hash $line" ;; | |
298 | ||
299 | # Split line. | |
300 | ,*,*,---*) ;; | |
301 | ||
302 | # We had nothing to search. | |
303 | ,,,bisect_rev*) | |
304 | echo "bisect_rev=" | |
305 | VARS=1 | |
306 | ;; | |
307 | ||
308 | # We did not find a good bisect rev. | |
309 | # This should happen only if the "bad" | |
310 | # commit is also a "skip" commit. | |
311 | ,,*,bisect_rev*) | |
312 | echo "bisect_rev=$TRIED" | |
313 | VARS=1 | |
314 | ;; | |
315 | ||
316 | # We are searching. | |
317 | ,,*,*) | |
318 | TRIED="${TRIED:+$TRIED|}$hash" | |
319 | case "$_skip" in | |
320 | *$hash*) ;; | |
321 | *) | |
322 | echo "bisect_rev=$hash" | |
323 | echo "bisect_tried=\"$TRIED\"" | |
324 | FOUND=1 | |
325 | ;; | |
326 | esac | |
327 | ;; | |
328 | ||
329 | # We have already found a rev to be tested. | |
330 | ,1,*,bisect_rev*) VARS=1 ;; | |
331 | ,1,*,*) ;; | |
332 | ||
333 | # ??? | |
334 | *) die "filter_skipped error " \ | |
335 | "VARS: '$VARS' " \ | |
336 | "FOUND: '$FOUND' " \ | |
337 | "TRIED: '$TRIED' " \ | |
338 | "hash: '$hash' " \ | |
339 | "line: '$line'" | |
340 | ;; | |
341 | esac | |
342 | done | |
343 | } | |
344 | ||
345 | exit_if_skipped_commits () { | |
346 | _tried=$1 | |
347 | if expr "$_tried" : ".*[|].*" > /dev/null ; then | |
348 | echo "There are only 'skip'ped commit left to test." | |
349 | echo "The first bad commit could be any of:" | |
e23cb8c0 | 350 | echo "$_tried" | tr '[|]' '[\012]' |
97e1c51e CC |
351 | echo "We cannot bisect more!" |
352 | exit 2 | |
353 | fi | |
354 | } | |
355 | ||
f821d089 CC |
356 | bisect_checkout() { |
357 | _rev="$1" | |
358 | _msg="$2" | |
359 | echo "Bisecting: $_msg" | |
c9c4e2d5 | 360 | mark_expected_rev "$_rev" |
f821d089 CC |
361 | git checkout -q "$_rev" || exit |
362 | git show-branch "$_rev" | |
363 | } | |
364 | ||
365 | is_among() { | |
366 | _rev="$1" | |
367 | _list="$2" | |
368 | case "$_list" in *$_rev*) return 0 ;; esac | |
369 | return 1 | |
370 | } | |
371 | ||
f821d089 CC |
372 | handle_bad_merge_base() { |
373 | _badmb="$1" | |
374 | _good="$2" | |
c9c4e2d5 | 375 | if is_expected_rev "$_badmb"; then |
f821d089 CC |
376 | cat >&2 <<EOF |
377 | The merge base $_badmb is bad. | |
378 | This means the bug has been fixed between $_badmb and [$_good]. | |
379 | EOF | |
380 | exit 3 | |
381 | else | |
382 | cat >&2 <<EOF | |
383 | Some good revs are not ancestor of the bad rev. | |
384 | git bisect cannot work properly in this case. | |
385 | Maybe you mistake good and bad revs? | |
386 | EOF | |
387 | exit 1 | |
388 | fi | |
389 | } | |
390 | ||
391 | handle_skipped_merge_base() { | |
392 | _mb="$1" | |
393 | _bad="$2" | |
394 | _good="$3" | |
395 | cat >&2 <<EOF | |
396 | Warning: the merge base between $_bad and [$_good] must be skipped. | |
397 | So we cannot be sure the first bad commit is between $_mb and $_bad. | |
398 | We continue anyway. | |
399 | EOF | |
400 | } | |
401 | ||
6a54d976 CC |
402 | # |
403 | # "check_merge_bases" checks that merge bases are not "bad". | |
404 | # | |
405 | # - If one is "good", that's good, we have nothing to do. | |
406 | # - If one is "bad", it means the user assumed something wrong | |
407 | # and we must exit. | |
408 | # - If one is "skipped", we can't know but we should warn. | |
409 | # - If we don't know, we should check it out and ask the user to test. | |
410 | # | |
411 | # In the last case we will return 1, and otherwise 0. | |
412 | # | |
f821d089 CC |
413 | check_merge_bases() { |
414 | _bad="$1" | |
415 | _good="$2" | |
416 | _skip="$3" | |
417 | for _mb in $(git merge-base --all $_bad $_good) | |
418 | do | |
419 | if is_among "$_mb" "$_good"; then | |
420 | continue | |
421 | elif test "$_mb" = "$_bad"; then | |
422 | handle_bad_merge_base "$_bad" "$_good" | |
423 | elif is_among "$_mb" "$_skip"; then | |
424 | handle_skipped_merge_base "$_mb" "$_bad" "$_good" | |
425 | else | |
f821d089 | 426 | bisect_checkout "$_mb" "a merge base must be tested" |
6a54d976 | 427 | return 1 |
f821d089 CC |
428 | fi |
429 | done | |
6a54d976 | 430 | return 0 |
f821d089 CC |
431 | } |
432 | ||
6a54d976 CC |
433 | # |
434 | # "check_good_are_ancestors_of_bad" checks that all "good" revs are | |
435 | # ancestor of the "bad" rev. | |
436 | # | |
437 | # If that's not the case, we need to check the merge bases. | |
438 | # If a merge base must be tested by the user we return 1 and | |
439 | # otherwise 0. | |
440 | # | |
f821d089 | 441 | check_good_are_ancestors_of_bad() { |
c9c4e2d5 CC |
442 | test -f "$GIT_DIR/BISECT_ANCESTORS_OK" && |
443 | return | |
444 | ||
f821d089 CC |
445 | _bad="$1" |
446 | _good=$(echo $2 | sed -e 's/\^//g') | |
447 | _skip="$3" | |
448 | ||
449 | # Bisecting with no good rev is ok | |
450 | test -z "$_good" && return | |
451 | ||
452 | _side=$(git rev-list $_good ^$_bad) | |
453 | if test -n "$_side"; then | |
6a54d976 | 454 | # Return if a checkout was done |
c9c4e2d5 | 455 | check_merge_bases "$_bad" "$_good" "$_skip" || return |
f821d089 | 456 | fi |
c9c4e2d5 CC |
457 | |
458 | : > "$GIT_DIR/BISECT_ANCESTORS_OK" | |
6a54d976 CC |
459 | |
460 | return 0 | |
f821d089 CC |
461 | } |
462 | ||
8cc6a083 | 463 | bisect_next() { |
8fe26f44 | 464 | case "$#" in 0) ;; *) usage ;; esac |
8cc6a083 | 465 | bisect_autostart |
0a5280a9 JH |
466 | bisect_next_check good |
467 | ||
f821d089 CC |
468 | # Get bad, good and skipped revs |
469 | bad=$(git rev-parse --verify refs/bisect/bad) && | |
470 | good=$(git for-each-ref --format='^%(objectname)' \ | |
471 | "refs/bisect/good-*" | tr '\012' ' ') && | |
97e1c51e | 472 | skip=$(git for-each-ref --format='%(objectname)' \ |
d2d188d9 | 473 | "refs/bisect/skip-*" | tr '\012' ' ') || exit |
97e1c51e | 474 | |
f821d089 | 475 | # Maybe some merge bases must be tested first |
6a54d976 CC |
476 | check_good_are_ancestors_of_bad "$bad" "$good" "$skip" |
477 | # Return now if a checkout has already been done | |
478 | test "$?" -eq "1" && return | |
f821d089 CC |
479 | |
480 | # Get bisection information | |
97e1c51e CC |
481 | BISECT_OPT='' |
482 | test -n "$skip" && BISECT_OPT='--bisect-all' | |
97e1c51e | 483 | eval="git rev-list --bisect-vars $BISECT_OPT $good $bad --" && |
0a5280a9 | 484 | eval="$eval $(cat "$GIT_DIR/BISECT_NAMES")" && |
97e1c51e | 485 | eval=$(filter_skipped "$eval" "$skip") && |
0a5280a9 JH |
486 | eval "$eval" || exit |
487 | ||
488 | if [ -z "$bisect_rev" ]; then | |
489 | echo "$bad was both good and bad" | |
490 | exit 1 | |
670f5fe3 | 491 | fi |
0a5280a9 | 492 | if [ "$bisect_rev" = "$bad" ]; then |
97e1c51e | 493 | exit_if_skipped_commits "$bisect_tried" |
0a5280a9 | 494 | echo "$bisect_rev is first bad commit" |
5be60078 | 495 | git diff-tree --pretty $bisect_rev |
0a5280a9 | 496 | exit 0 |
8cc6a083 | 497 | fi |
0a5280a9 | 498 | |
97e1c51e CC |
499 | # We should exit here only if the "bad" |
500 | # commit is also a "skip" commit (see above). | |
501 | exit_if_skipped_commits "$bisect_rev" | |
502 | ||
f821d089 | 503 | bisect_checkout "$bisect_rev" "$bisect_nr revisions left to test after this" |
8cc6a083 LT |
504 | } |
505 | ||
cc9f24d0 JH |
506 | bisect_visualize() { |
507 | bisect_next_check fail | |
235997c9 JH |
508 | |
509 | if test $# = 0 | |
510 | then | |
508e84a7 | 511 | case "${DISPLAY+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" in |
235997c9 | 512 | '') set git log ;; |
508e84a7 | 513 | set*) set gitk ;; |
235997c9 JH |
514 | esac |
515 | else | |
516 | case "$1" in | |
517 | git*|tig) ;; | |
518 | -*) set git log "$@" ;; | |
519 | *) set git "$@" ;; | |
520 | esac | |
521 | fi | |
522 | ||
e3f062bf | 523 | not=$(git for-each-ref --format='%(refname)' "refs/bisect/good-*") |
235997c9 | 524 | eval '"$@"' refs/bisect/bad --not $not -- $(cat "$GIT_DIR/BISECT_NAMES") |
cc9f24d0 JH |
525 | } |
526 | ||
8cc6a083 | 527 | bisect_reset() { |
823ea121 | 528 | test -s "$GIT_DIR/BISECT_START" || { |
fce0499f CC |
529 | echo "We are not bisecting." |
530 | return | |
531 | } | |
8cc6a083 | 532 | case "$#" in |
823ea121 | 533 | 0) branch=$(cat "$GIT_DIR/BISECT_START") ;; |
737c74ee CC |
534 | 1) git show-ref --verify --quiet -- "refs/heads/$1" || |
535 | die "$1 does not seem to be a valid branch" | |
8cc6a083 | 536 | branch="$1" ;; |
8fe26f44 | 537 | *) |
8cc6a083 LT |
538 | usage ;; |
539 | esac | |
9d0cd91c | 540 | git checkout "$branch" && bisect_clean_state |
e204de28 JH |
541 | } |
542 | ||
38a47fd6 | 543 | bisect_clean_state() { |
947a604b | 544 | # There may be some refs packed during bisection. |
634f2464 | 545 | git for-each-ref --format='%(refname) %(objectname)' refs/bisect/\* | |
947a604b CC |
546 | while read ref hash |
547 | do | |
823ea121 | 548 | git update-ref -d $ref $hash || exit |
947a604b | 549 | done |
c9c4e2d5 CC |
550 | rm -f "$GIT_DIR/BISECT_EXPECTED_REV" && |
551 | rm -f "$GIT_DIR/BISECT_ANCESTORS_OK" && | |
823ea121 CC |
552 | rm -f "$GIT_DIR/BISECT_LOG" && |
553 | rm -f "$GIT_DIR/BISECT_NAMES" && | |
554 | rm -f "$GIT_DIR/BISECT_RUN" && | |
9d0cd91c | 555 | # Cleanup head-name if it got left by an old version of git-bisect |
823ea121 CC |
556 | rm -f "$GIT_DIR/head-name" && |
557 | ||
558 | rm -f "$GIT_DIR/BISECT_START" | |
38a47fd6 CC |
559 | } |
560 | ||
e204de28 | 561 | bisect_replay () { |
737c74ee | 562 | test -r "$1" || die "cannot read $1 for replaying" |
e204de28 | 563 | bisect_reset |
6c98c054 | 564 | while read git bisect command rev |
e204de28 | 565 | do |
6c98c054 MV |
566 | test "$git $bisect" = "git bisect" -o "$git" = "git-bisect" || continue |
567 | if test "$git" = "git-bisect"; then | |
568 | rev="$command" | |
569 | command="$bisect" | |
570 | fi | |
e204de28 JH |
571 | case "$command" in |
572 | start) | |
e9a45d75 | 573 | cmd="bisect_start $rev" |
737c74ee CC |
574 | eval "$cmd" ;; |
575 | good|bad|skip) | |
576 | bisect_write "$command" "$rev" ;; | |
e204de28 | 577 | *) |
737c74ee | 578 | die "?? what are you talking about?" ;; |
e204de28 JH |
579 | esac |
580 | done <"$1" | |
581 | bisect_auto_next | |
8cc6a083 LT |
582 | } |
583 | ||
a17c4101 | 584 | bisect_run () { |
83020120 CC |
585 | bisect_next_check fail |
586 | ||
a17c4101 CC |
587 | while true |
588 | do | |
589 | echo "running $@" | |
590 | "$@" | |
591 | res=$? | |
592 | ||
593 | # Check for really bad run error. | |
594 | if [ $res -lt 0 -o $res -ge 128 ]; then | |
595 | echo >&2 "bisect run failed:" | |
596 | echo >&2 "exit code $res from '$@' is < 0 or >= 128" | |
597 | exit $res | |
598 | fi | |
599 | ||
155fc795 | 600 | # Find current state depending on run success or failure. |
71b0251c CC |
601 | # A special exit code of 125 means cannot test. |
602 | if [ $res -eq 125 ]; then | |
603 | state='skip' | |
604 | elif [ $res -gt 0 ]; then | |
155fc795 | 605 | state='bad' |
a17c4101 | 606 | else |
155fc795 | 607 | state='good' |
a17c4101 CC |
608 | fi |
609 | ||
155fc795 CC |
610 | # We have to use a subshell because "bisect_state" can exit. |
611 | ( bisect_state $state > "$GIT_DIR/BISECT_RUN" ) | |
a17c4101 CC |
612 | res=$? |
613 | ||
614 | cat "$GIT_DIR/BISECT_RUN" | |
615 | ||
71b0251c CC |
616 | if grep "first bad commit could be any of" "$GIT_DIR/BISECT_RUN" \ |
617 | > /dev/null; then | |
618 | echo >&2 "bisect run cannot continue any more" | |
619 | exit $res | |
620 | fi | |
621 | ||
a17c4101 CC |
622 | if [ $res -ne 0 ]; then |
623 | echo >&2 "bisect run failed:" | |
155fc795 | 624 | echo >&2 "'bisect_state $state' exited with error code $res" |
a17c4101 CC |
625 | exit $res |
626 | fi | |
627 | ||
628 | if grep "is first bad commit" "$GIT_DIR/BISECT_RUN" > /dev/null; then | |
629 | echo "bisect run success" | |
630 | exit 0; | |
631 | fi | |
632 | ||
633 | done | |
634 | } | |
635 | ||
636 | ||
8cc6a083 LT |
637 | case "$#" in |
638 | 0) | |
639 | usage ;; | |
640 | *) | |
641 | cmd="$1" | |
642 | shift | |
643 | case "$cmd" in | |
243a60fb CC |
644 | help) |
645 | git bisect -h ;; | |
8cc6a083 LT |
646 | start) |
647 | bisect_start "$@" ;; | |
ee2314f5 | 648 | bad|good) |
155fc795 | 649 | bisect_state "$cmd" "$@" ;; |
ee2314f5 CC |
650 | skip) |
651 | bisect_skip "$@" ;; | |
8cc6a083 LT |
652 | next) |
653 | # Not sure we want "next" at the UI level anymore. | |
654 | bisect_next "$@" ;; | |
235997c9 | 655 | visualize|view) |
cc9f24d0 | 656 | bisect_visualize "$@" ;; |
8cc6a083 LT |
657 | reset) |
658 | bisect_reset "$@" ;; | |
e204de28 JH |
659 | replay) |
660 | bisect_replay "$@" ;; | |
661 | log) | |
662 | cat "$GIT_DIR/BISECT_LOG" ;; | |
a17c4101 CC |
663 | run) |
664 | bisect_run "$@" ;; | |
8cc6a083 LT |
665 | *) |
666 | usage ;; | |
667 | esac | |
668 | esac |