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>|<range>)...] 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 175is_expected_rev() { 176test -f"$GIT_DIR/BISECT_EXPECTED_REV"&& 177test"$1"=$(cat "$GIT_DIR/BISECT_EXPECTED_REV") 178} 179 180mark_expected_rev() { 181echo"$1">"$GIT_DIR/BISECT_EXPECTED_REV" 182} 183 184check_expected_revs() { 185for _rev in"$@";do 186if! is_expected_rev "$_rev";then 187rm-f"$GIT_DIR/BISECT_ANCESTORS_OK" 188rm-f"$GIT_DIR/BISECT_EXPECTED_REV" 189return 190fi 191done 192} 193 194bisect_skip() { 195 all='' 196for arg in"$@" 197do 198case"$arg"in 199*..*) 200 revs=$(git rev-list "$arg")|| die "Bad rev input:$arg";; 201*) 202 revs=$(sq "$arg");; 203esac 204 all="$all$revs" 205done 206eval bisect_state 'skip'$all 207} 208 209bisect_state() { 210 bisect_autostart 211 state=$1 212case"$#,$state"in 2130,*) 214 die "Please call 'bisect_state' with at least one argument.";; 2151,bad|1,good|1,skip) 216rev=$(git rev-parse --verify HEAD)|| 217 die "Bad rev input: HEAD" 218 bisect_write "$state""$rev" 219 check_expected_revs "$rev";; 2202,bad|*,good|*,skip) 221shift 222eval='' 223forrevin"$@" 224do 225 sha=$(git rev-parse --verify "$rev^{commit}")|| 226 die "Bad rev input:$rev" 227eval="$evalbisect_write '$state' '$sha'; " 228done 229eval"$eval" 230 check_expected_revs "$@";; 231*,bad) 232 die "'git bisect bad' can take only one argument.";; 233*) 234 usage ;; 235esac 236 bisect_auto_next 237} 238 239bisect_next_check() { 240 missing_good= missing_bad= 241 git show-ref -q --verify refs/bisect/bad || missing_bad=t 242test -n"$(git for-each-ref "refs/bisect/good-*")"|| missing_good=t 243 244case"$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. 255echo>&2'Warning: bisecting only with a bad commit.' 256iftest -t0 257then 258printf>&2'Are you sure [Y/n]? ' 259read yesno 260case"$yesno"in[Nn]*)exit1;;esac 261fi 262: bisect without good... 263;; 264*) 265 THEN='' 266test -s"$GIT_DIR/BISECT_START"|| { 267echo>&2'You need to start by "git bisect start".' 268 THEN='then ' 269} 270echo>&2'You '$THEN'need to give me at least one good' \ 271'and one bad revisions.' 272echo>&2'(You can use "git bisect bad" and' \ 273'"git bisect good" for that.)' 274exit1;; 275esac 276} 277 278bisect_auto_next() { 279 bisect_next_check && bisect_next || : 280} 281 282filter_skipped() { 283 _eval="$1" 284 _skip="$2" 285 286if[-z"$_skip"];then 287eval"$_eval" 288return 289fi 290 291# Let's parse the output of: 292# "git rev-list --bisect-vars --bisect-all ..." 293eval"$_eval"| { 294 VARS= FOUND= TRIED= 295whileread hash line 296do 297case"$VARS,$FOUND,$TRIED,$hash"in 2981,*,*,*) 299# "bisect_foo=bar" read from rev-list output. 300echo"$hash&&" 301;; 302,*,*,---*) 303# Separator 304;; 305,,,bisect_rev*) 306# We had nothing to search. 307echo"bisect_rev= &&" 308 VARS=1 309;; 310,,*,bisect_rev*) 311# We did not find a good bisect rev. 312# This should happen only if the "bad" 313# commit is also a "skip" commit. 314echo"bisect_rev='$TRIED' &&" 315 VARS=1 316;; 317,,*,*) 318# We are searching. 319 TRIED="${TRIED:+$TRIED|}$hash" 320case"$_skip"in 321*$hash*) ;; 322*) 323echo"bisect_rev=$hash&&" 324echo"bisect_tried='$TRIED' &&" 325 FOUND=1 326;; 327esac 328;; 329,1,*,bisect_rev*) 330# We have already found a rev to be tested. 331 VARS=1 332;; 333,1,*,*) 334;; 335*) 336# Unexpected input 337echo"die 'filter_skipped error'" 338 die "filter_skipped error " \ 339"VARS: '$VARS' " \ 340"FOUND: '$FOUND' " \ 341"TRIED: '$TRIED' " \ 342"hash: '$hash' " \ 343"line: '$line'" 344;; 345esac 346done 347echo':' 348} 349} 350 351exit_if_skipped_commits () { 352 _tried=$1 353ifexpr"$_tried":".*[|].*"> /dev/null ;then 354echo"There are only 'skip'ped commit left to test." 355echo"The first bad commit could be any of:" 356echo"$_tried"|tr'[|]''[\012]' 357echo"We cannot bisect more!" 358exit2 359fi 360} 361 362bisect_checkout() { 363 _rev="$1" 364 _msg="$2" 365echo"Bisecting:$_msg" 366 mark_expected_rev "$_rev" 367 git checkout -q"$_rev"||exit 368 git show-branch"$_rev" 369} 370 371is_among() { 372 _rev="$1" 373 _list="$2" 374case"$_list"in*$_rev*)return0;;esac 375return1 376} 377 378handle_bad_merge_base() { 379 _badmb="$1" 380 _good="$2" 381if is_expected_rev "$_badmb";then 382cat>&2<<EOF 383The merge base$_badmbis bad. 384This means the bug has been fixed between$_badmband [$_good]. 385EOF 386exit3 387else 388cat>&2<<EOF 389Some good revs are not ancestor of the bad rev. 390git bisect cannot work properly in this case. 391Maybe you mistake good and bad revs? 392EOF 393exit1 394fi 395} 396 397handle_skipped_merge_base() { 398 _mb="$1" 399 _bad="$2" 400 _good="$3" 401cat>&2<<EOF 402Warning: the merge base between$_badand [$_good] must be skipped. 403So we cannot be sure the first bad commit is between$_mband$_bad. 404We continue anyway. 405EOF 406} 407 408# 409# "check_merge_bases" checks that merge bases are not "bad". 410# 411# - If one is "good", that's good, we have nothing to do. 412# - If one is "bad", it means the user assumed something wrong 413# and we must exit. 414# - If one is "skipped", we can't know but we should warn. 415# - If we don't know, we should check it out and ask the user to test. 416# 417# In the last case we will return 1, and otherwise 0. 418# 419check_merge_bases() { 420 _bad="$1" 421 _good="$2" 422 _skip="$3" 423for _mb in$(git merge-base --all $_bad $_good) 424do 425if is_among "$_mb""$_good";then 426continue 427eliftest"$_mb"="$_bad";then 428 handle_bad_merge_base "$_bad""$_good" 429elif is_among "$_mb""$_skip";then 430 handle_skipped_merge_base "$_mb""$_bad""$_good" 431else 432 bisect_checkout "$_mb""a merge base must be tested" 433return1 434fi 435done 436return0 437} 438 439# 440# "check_good_are_ancestors_of_bad" checks that all "good" revs are 441# ancestor of the "bad" rev. 442# 443# If that's not the case, we need to check the merge bases. 444# If a merge base must be tested by the user we return 1 and 445# otherwise 0. 446# 447check_good_are_ancestors_of_bad() { 448test -f"$GIT_DIR/BISECT_ANCESTORS_OK"&& 449return 450 451 _bad="$1" 452 _good=$(echo $2 | sed -e 's/\^//g') 453 _skip="$3" 454 455# Bisecting with no good rev is ok 456test -z"$_good"&&return 457 458 _side=$(git rev-list $_good ^$_bad) 459iftest -n"$_side";then 460# Return if a checkout was done 461 check_merge_bases "$_bad""$_good""$_skip"||return 462fi 463 464: >"$GIT_DIR/BISECT_ANCESTORS_OK" 465 466return0 467} 468 469bisect_next() { 470case"$#"in0) ;; *) usage ;;esac 471 bisect_autostart 472 bisect_next_check good 473 474# Get bad, good and skipped revs 475 bad=$(git rev-parse --verify refs/bisect/bad)&& 476 good=$(git for-each-ref --format='^%(objectname)' \ 477 "refs/bisect/good-*" | tr '\012' '') && 478 skip=$(git for-each-ref --format='%(objectname)' \ 479"refs/bisect/skip-*"|tr'\012'' ') ||exit 480 481# Maybe some merge bases must be tested first 482 check_good_are_ancestors_of_bad "$bad""$good""$skip" 483# Return now if a checkout has already been done 484test"$?"-eq"1"&&return 485 486# Get bisection information 487 BISECT_OPT='' 488test -n"$skip"&& BISECT_OPT='--bisect-all' 489eval="git rev-list --bisect-vars$BISECT_OPT$good$bad--"&& 490eval="$eval$(cat "$GIT_DIR/BISECT_NAMES")"&& 491eval=$(filter_skipped "$eval" "$skip")&& 492eval"$eval"||exit 493 494if[-z"$bisect_rev"];then 495echo"$badwas both good and bad" 496exit1 497fi 498if["$bisect_rev"="$bad"];then 499 exit_if_skipped_commits "$bisect_tried" 500echo"$bisect_revis first bad commit" 501 git diff-tree --pretty$bisect_rev 502exit0 503fi 504 505# We should exit here only if the "bad" 506# commit is also a "skip" commit (see above). 507 exit_if_skipped_commits "$bisect_rev" 508 509 bisect_checkout "$bisect_rev""$bisect_nrrevisions left to test after this" 510} 511 512bisect_visualize() { 513 bisect_next_check fail 514 515iftest$#=0 516then 517case"${DISPLAY+set}${SESSIONNAME+set}${MSYSTEM+set}${SECURITYSESSIONID+set}"in 518'')set git log ;; 519set*)set gitk ;; 520esac 521else 522case"$1"in 523 git*|tig) ;; 524-*)set git log "$@";; 525*)set git "$@";; 526esac 527fi 528 529 not=$(git for-each-ref --format='%(refname)' "refs/bisect/good-*") 530 eval '"$@"' refs/bisect/bad --not$not--$(cat "$GIT_DIR/BISECT_NAMES") 531} 532 533bisect_reset() { 534 test -s "$GIT_DIR/BISECT_START" || { 535 echo "We are not bisecting." 536 return 537 } 538 case "$#" in 539 0) branch=$(cat "$GIT_DIR/BISECT_START");; 540 1) git show-ref --verify --quiet -- "refs/heads/$1" || 541 die "$1does not seem to be a valid branch" 542 branch="$1" ;; 543 *) 544 usage ;; 545 esac 546 git checkout "$branch" && bisect_clean_state 547} 548 549bisect_clean_state() { 550 # There may be some refs packed during bisection. 551 git for-each-ref --format='%(refname) %(objectname)' refs/bisect/\* | 552 while read ref hash 553 do 554 git update-ref -d$ref$hash|| exit 555 done 556 rm -f "$GIT_DIR/BISECT_EXPECTED_REV" && 557 rm -f "$GIT_DIR/BISECT_ANCESTORS_OK" && 558 rm -f "$GIT_DIR/BISECT_LOG" && 559 rm -f "$GIT_DIR/BISECT_NAMES" && 560 rm -f "$GIT_DIR/BISECT_RUN" && 561 # Cleanup head-name if it got left by an old version of git-bisect 562 rm -f "$GIT_DIR/head-name" && 563 564 rm -f "$GIT_DIR/BISECT_START" 565} 566 567bisect_replay () { 568 test -r "$1" || die "cannot read$1for replaying" 569 bisect_reset 570 while read git bisect command rev 571 do 572 test "$git$bisect" = "git bisect" -o "$git" = "git-bisect" || continue 573 if test "$git" = "git-bisect"; then 574 rev="$command" 575 command="$bisect" 576 fi 577 case "$command" in 578 start) 579 cmd="bisect_start$rev" 580 eval "$cmd" ;; 581 good|bad|skip) 582 bisect_write "$command" "$rev" ;; 583 *) 584 die "?? what are you talking about?" ;; 585 esac 586 done <"$1" 587 bisect_auto_next 588} 589 590bisect_run () { 591 bisect_next_check fail 592 593 while true 594 do 595 echo "running $@" 596 "$@" 597 res=$? 598 599 # Check for really bad run error. 600 if [$res-lt 0 -o$res-ge 128 ]; then 601 echo >&2 "bisect run failed:" 602 echo >&2 "exit code$resfrom '$@' is < 0 or >= 128" 603 exit$res 604 fi 605 606 # Find current state depending on run success or failure. 607 # A special exit code of 125 means cannot test. 608 if [$res-eq 125 ]; then 609 state='skip' 610 elif [$res-gt 0 ]; then 611 state='bad' 612 else 613 state='good' 614 fi 615 616 # We have to use a subshell because "bisect_state" can exit. 617 ( bisect_state$state> "$GIT_DIR/BISECT_RUN" ) 618 res=$? 619 620 cat "$GIT_DIR/BISECT_RUN" 621 622 if grep "first bad commit could be any of" "$GIT_DIR/BISECT_RUN" \ 623 > /dev/null; then 624 echo >&2 "bisect run cannot continue any more" 625 exit$res 626 fi 627 628 if [$res-ne 0 ]; then 629 echo >&2 "bisect run failed:" 630 echo >&2 "'bisect_state $state' exited with error code$res" 631 exit$res 632 fi 633 634 if grep "is first bad commit" "$GIT_DIR/BISECT_RUN" > /dev/null; then 635 echo "bisect run success" 636 exit 0; 637 fi 638 639 done 640} 641 642 643case "$#" in 6440) 645 usage ;; 646*) 647 cmd="$1" 648 shift 649 case "$cmd" in 650 help) 651 git bisect -h ;; 652 start) 653 bisect_start "$@" ;; 654 bad|good) 655 bisect_state "$cmd" "$@" ;; 656 skip) 657 bisect_skip "$@" ;; 658 next) 659 # Not sure we want "next" at the UI level anymore. 660 bisect_next "$@" ;; 661 visualize|view) 662 bisect_visualize "$@" ;; 663 reset) 664 bisect_reset "$@" ;; 665 replay) 666 bisect_replay "$@" ;; 667 log) 668 cat "$GIT_DIR/BISECT_LOG" ;; 669 run) 670 bisect_run "$@" ;; 671 *) 672 usage ;; 673 esac 674esac