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