Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 1 | #!/bin/sh |
Fredrik Kuivinen | d025524 | 2005-12-11 10:55:49 +0100 | [diff] [blame] | 2 | |
Robert P. J. Day | dbc349b | 2017-11-12 04:30:38 -0500 | [diff] [blame] | 3 | USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|view|replay|log|run]' |
Christian Couder | 243a60f | 2008-04-11 05:55:21 +0200 | [diff] [blame] | 4 | LONG_USAGE='git bisect help |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 5 | print this long help message. |
Hugo Locurcio | ef4d9f8 | 2020-08-28 15:31:19 +0000 | [diff] [blame] | 6 | git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] |
Aaron Lipman | 6028f5f | 2020-08-22 16:32:03 -0400 | [diff] [blame] | 7 | [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...] |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 8 | reset bisect state and start bisection. |
Antoine Delaite | 21e5cfd | 2015-06-29 17:40:33 +0200 | [diff] [blame] | 9 | git bisect (bad|new) [<rev>] |
| 10 | mark <rev> a known-bad revision/ |
| 11 | a revision after change in a given property. |
| 12 | git bisect (good|old) [<rev>...] |
| 13 | mark <rev>... known-good revisions/ |
| 14 | revisions before change in a given property. |
Matthieu Moy | 21b55e3 | 2015-06-29 17:40:34 +0200 | [diff] [blame] | 15 | git bisect terms [--term-good | --term-bad] |
| 16 | show the terms used for old and new commits (default: bad, good) |
Christian Couder | 5413812 | 2008-12-02 14:53:51 +0100 | [diff] [blame] | 17 | git bisect skip [(<rev>|<range>)...] |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 18 | mark <rev>... untestable revisions. |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 19 | git bisect next |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 20 | find next bisection to test and check it out. |
Anders Kaseorg | 6b87ce2 | 2009-10-13 17:02:24 -0400 | [diff] [blame] | 21 | git bisect reset [<commit>] |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 22 | finish bisection search and go back to commit. |
Robert P. J. Day | dbc349b | 2017-11-12 04:30:38 -0500 | [diff] [blame] | 23 | git bisect (visualize|view) |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 24 | show bisect status in gitk. |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 25 | git bisect replay <logfile> |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 26 | replay bisection log. |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 27 | git bisect log |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 28 | show bisect log. |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 29 | git bisect run <cmd>... |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 30 | use <cmd>... to automatically bisect. |
Christian Couder | 243a60f | 2008-04-11 05:55:21 +0200 | [diff] [blame] | 31 | |
| 32 | Please use "git help bisect" to get the full man page.' |
Fredrik Kuivinen | d025524 | 2005-12-11 10:55:49 +0100 | [diff] [blame] | 33 | |
Junio C Hamano | 8f321a3 | 2007-11-06 01:50:02 -0800 | [diff] [blame] | 34 | OPTIONS_SPEC= |
Junio C Hamano | ae2b0f1 | 2005-11-24 00:12:11 -0800 | [diff] [blame] | 35 | . git-sh-setup |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 36 | |
Johannes Schindelin | ce32660 | 2008-02-10 13:59:50 +0000 | [diff] [blame] | 37 | _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' |
| 38 | _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 39 | TERM_BAD=bad |
| 40 | TERM_GOOD=good |
Johannes Schindelin | ce32660 | 2008-02-10 13:59:50 +0000 | [diff] [blame] | 41 | |
Junio C Hamano | cc9f24d | 2005-08-30 12:45:41 -0700 | [diff] [blame] | 42 | bisect_visualize() { |
Pranit Bauva | 129a6cf | 2019-01-02 07:38:34 -0800 | [diff] [blame] | 43 | git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit |
Junio C Hamano | 235997c | 2007-12-07 02:25:34 -0800 | [diff] [blame] | 44 | |
| 45 | if test $# = 0 |
| 46 | then |
Jeff King | c4e4644e | 2011-03-21 09:14:22 -0400 | [diff] [blame] | 47 | if test -n "${DISPLAY+set}${SESSIONNAME+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" && |
Junio C Hamano | 43b8ff4 | 2011-08-05 10:09:23 -0700 | [diff] [blame] | 48 | type gitk >/dev/null 2>&1 |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 49 | then |
Jeff King | c4e4644e | 2011-03-21 09:14:22 -0400 | [diff] [blame] | 50 | set gitk |
| 51 | else |
| 52 | set git log |
| 53 | fi |
Junio C Hamano | 235997c | 2007-12-07 02:25:34 -0800 | [diff] [blame] | 54 | else |
| 55 | case "$1" in |
| 56 | git*|tig) ;; |
| 57 | -*) set git log "$@" ;; |
| 58 | *) set git "$@" ;; |
| 59 | esac |
| 60 | fi |
| 61 | |
Christian Couder | fc13aa3 | 2009-11-23 05:16:14 +0100 | [diff] [blame] | 62 | eval '"$@"' --bisect -- $(cat "$GIT_DIR/BISECT_NAMES") |
Junio C Hamano | cc9f24d | 2005-08-30 12:45:41 -0700 | [diff] [blame] | 63 | } |
| 64 | |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 65 | bisect_run () { |
Pranit Bauva | 129a6cf | 2019-01-02 07:38:34 -0800 | [diff] [blame] | 66 | git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit |
Christian Couder | 8302012 | 2007-03-27 06:49:57 +0200 | [diff] [blame] | 67 | |
Stephan Beyer | fecd2dd | 2017-11-12 21:55:33 +0100 | [diff] [blame] | 68 | test -n "$*" || die "$(gettext "bisect run failed: no command provided.")" |
| 69 | |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 70 | while true |
| 71 | do |
| 72 | command="$@" |
Jon Seymour | 3145b1a | 2011-08-31 09:09:47 +1000 | [diff] [blame] | 73 | eval_gettextln "running \$command" |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 74 | "$@" |
| 75 | res=$? |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 76 | |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 77 | # Check for really bad run error. |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 78 | if [ $res -lt 0 -o $res -ge 128 ] |
| 79 | then |
Jon Seymour | 3145b1a | 2011-08-31 09:09:47 +1000 | [diff] [blame] | 80 | eval_gettextln "bisect run failed: |
| 81 | exit code \$res from '\$command' is < 0 or >= 128" >&2 |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 82 | exit $res |
| 83 | fi |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 84 | |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 85 | # Find current state depending on run success or failure. |
| 86 | # A special exit code of 125 means cannot test. |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 87 | if [ $res -eq 125 ] |
| 88 | then |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 89 | state='skip' |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 90 | elif [ $res -gt 0 ] |
| 91 | then |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 92 | state="$TERM_BAD" |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 93 | else |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 94 | state="$TERM_GOOD" |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 95 | fi |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 96 | |
Pranit Bauva | 27257bc | 2020-10-15 15:38:35 +0200 | [diff] [blame] | 97 | git bisect--helper --bisect-state $state >"$GIT_DIR/BISECT_RUN" |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 98 | res=$? |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 99 | |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 100 | cat "$GIT_DIR/BISECT_RUN" |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 101 | |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 102 | if sane_grep "first $TERM_BAD commit could be any of" "$GIT_DIR/BISECT_RUN" \ |
Jacopo Notarstefano | 305a233 | 2014-03-04 01:21:43 +0100 | [diff] [blame] | 103 | >/dev/null |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 104 | then |
Jon Seymour | 3145b1a | 2011-08-31 09:09:47 +1000 | [diff] [blame] | 105 | gettextln "bisect run cannot continue any more" >&2 |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 106 | exit $res |
| 107 | fi |
Christian Couder | 71b0251 | 2007-10-26 05:39:37 +0200 | [diff] [blame] | 108 | |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 109 | if [ $res -ne 0 ] |
| 110 | then |
Jon Seymour | 3145b1a | 2011-08-31 09:09:47 +1000 | [diff] [blame] | 111 | eval_gettextln "bisect run failed: |
Pranit Bauva | 27257bc | 2020-10-15 15:38:35 +0200 | [diff] [blame] | 112 | 'bisect-state \$state' exited with error code \$res" >&2 |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 113 | exit $res |
| 114 | fi |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 115 | |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 116 | if sane_grep "is the first $TERM_BAD commit" "$GIT_DIR/BISECT_RUN" >/dev/null |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 117 | then |
Jon Seymour | 3145b1a | 2011-08-31 09:09:47 +1000 | [diff] [blame] | 118 | gettextln "bisect run success" |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 119 | exit 0; |
| 120 | fi |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 121 | |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 122 | done |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 123 | } |
| 124 | |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 125 | get_terms () { |
| 126 | if test -s "$GIT_DIR/BISECT_TERMS" |
| 127 | then |
| 128 | { |
| 129 | read TERM_BAD |
| 130 | read TERM_GOOD |
| 131 | } <"$GIT_DIR/BISECT_TERMS" |
| 132 | fi |
| 133 | } |
| 134 | |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 135 | case "$#" in |
| 136 | 0) |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 137 | usage ;; |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 138 | *) |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 139 | cmd="$1" |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 140 | get_terms |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 141 | shift |
| 142 | case "$cmd" in |
| 143 | help) |
| 144 | git bisect -h ;; |
| 145 | start) |
Pranit Bauva | 88ad372 | 2020-10-15 15:38:32 +0200 | [diff] [blame] | 146 | git bisect--helper --bisect-start "$@" ;; |
Antoine Delaite | 21e5cfd | 2015-06-29 17:40:33 +0200 | [diff] [blame] | 147 | bad|good|new|old|"$TERM_BAD"|"$TERM_GOOD") |
Pranit Bauva | 27257bc | 2020-10-15 15:38:35 +0200 | [diff] [blame] | 148 | git bisect--helper --bisect-state "$cmd" "$@" ;; |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 149 | skip) |
Pranit Bauva | e4c7b33 | 2021-02-03 22:54:37 +0100 | [diff] [blame] | 150 | git bisect--helper --bisect-skip "$@" || exit;; |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 151 | next) |
| 152 | # Not sure we want "next" at the UI level anymore. |
Pranit Bauva | 517ecb3 | 2020-09-24 14:33:40 +0200 | [diff] [blame] | 153 | git bisect--helper --bisect-next "$@" || exit ;; |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 154 | visualize|view) |
| 155 | bisect_visualize "$@" ;; |
| 156 | reset) |
Pranit Bauva | 5e82c3d | 2019-01-02 07:38:31 -0800 | [diff] [blame] | 157 | git bisect--helper --bisect-reset "$@" ;; |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 158 | replay) |
Pranit Bauva | 2b1fd94 | 2021-02-03 22:54:33 +0100 | [diff] [blame] | 159 | git bisect--helper --bisect-replay "$@" || exit;; |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 160 | log) |
Pranit Bauva | 97d5ba6 | 2021-02-03 22:54:32 +0100 | [diff] [blame] | 161 | git bisect--helper --bisect-log || exit ;; |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 162 | run) |
| 163 | bisect_run "$@" ;; |
Matthieu Moy | 21b55e3 | 2015-06-29 17:40:34 +0200 | [diff] [blame] | 164 | terms) |
Pranit Bauva | 450ebb7 | 2019-01-02 07:38:35 -0800 | [diff] [blame] | 165 | git bisect--helper --bisect-terms "$@" || exit;; |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 166 | *) |
| 167 | usage ;; |
| 168 | esac |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 169 | esac |