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 | |
Christian Couder | 243a60f | 2008-04-11 05:55:21 +0200 | [diff] [blame] | 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>...] |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 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. |
Christian Couder | 5413812 | 2008-12-02 14:53:51 +0100 | [diff] [blame] | 12 | git bisect skip [(<rev>|<range>)...] |
Christian Couder | 6ca8b97 | 2007-10-29 05:31:52 +0100 | [diff] [blame] | 13 | mark <rev>... untestable revisions. |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 14 | git bisect next |
| 15 | find next bisection to test and check it out. |
Anders Kaseorg | 6b87ce2 | 2009-10-13 17:02:24 -0400 | [diff] [blame] | 16 | git bisect reset [<commit>] |
| 17 | finish bisection search and go back to commit. |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 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>... |
Christian Couder | 243a60f | 2008-04-11 05:55:21 +0200 | [diff] [blame] | 25 | use <cmd>... to automatically bisect. |
| 26 | |
| 27 | Please use "git help bisect" to get the full man page.' |
Fredrik Kuivinen | d025524 | 2005-12-11 10:55:49 +0100 | [diff] [blame] | 28 | |
Junio C Hamano | 8f321a3 | 2007-11-06 01:50:02 -0800 | [diff] [blame] | 29 | OPTIONS_SPEC= |
Junio C Hamano | ae2b0f1 | 2005-11-24 00:12:11 -0800 | [diff] [blame] | 30 | . git-sh-setup |
Junio C Hamano | 4c55068 | 2007-02-05 14:03:27 -0800 | [diff] [blame] | 31 | require_work_tree |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 32 | |
Johannes Schindelin | ce32660 | 2008-02-10 13:59:50 +0000 | [diff] [blame] | 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 | |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 36 | bisect_autostart() { |
Christian Couder | 823ea12 | 2008-05-28 18:57:02 +0200 | [diff] [blame] | 37 | test -s "$GIT_DIR/BISECT_START" || { |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 38 | echo >&2 'You need to start by "git bisect start"' |
| 39 | if test -t 0 |
| 40 | then |
| 41 | echo >&2 -n 'Do you want me to do it for you [Y/n]? ' |
| 42 | read yesno |
| 43 | case "$yesno" in |
| 44 | [Nn]*) |
| 45 | exit ;; |
| 46 | esac |
| 47 | bisect_start |
| 48 | else |
| 49 | exit 1 |
| 50 | fi |
| 51 | } |
| 52 | } |
| 53 | |
| 54 | bisect_start() { |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 55 | # |
Christian Couder | 634f246 | 2008-05-23 01:28:57 +0200 | [diff] [blame] | 56 | # Verify HEAD. |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 57 | # |
Christian Couder | 48949a1 | 2008-04-16 04:09:49 +0200 | [diff] [blame] | 58 | head=$(GIT_DIR="$GIT_DIR" git symbolic-ref -q HEAD) || |
Johannes Schindelin | ce32660 | 2008-02-10 13:59:50 +0000 | [diff] [blame] | 59 | head=$(GIT_DIR="$GIT_DIR" git rev-parse --verify HEAD) || |
| 60 | die "Bad HEAD - I need a HEAD" |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 61 | |
| 62 | # |
Christian Couder | 634f246 | 2008-05-23 01:28:57 +0200 | [diff] [blame] | 63 | # Check if we are bisecting. |
| 64 | # |
| 65 | start_head='' |
| 66 | if test -s "$GIT_DIR/BISECT_START" |
| 67 | then |
| 68 | # Reset to the rev from where we started. |
| 69 | start_head=$(cat "$GIT_DIR/BISECT_START") |
Christian Couder | f3a186f | 2009-04-04 22:02:26 +0200 | [diff] [blame] | 70 | git checkout "$start_head" -- || exit |
Christian Couder | 634f246 | 2008-05-23 01:28:57 +0200 | [diff] [blame] | 71 | else |
| 72 | # Get rev from where we start. |
| 73 | case "$head" in |
| 74 | refs/heads/*|$_x40) |
| 75 | # This error message should only be triggered by |
| 76 | # cogito usage, and cogito users should understand |
| 77 | # it relates to cg-seek. |
| 78 | [ -s "$GIT_DIR/head-name" ] && |
| 79 | die "won't bisect on seeked tree" |
| 80 | start_head="${head#refs/heads/}" |
| 81 | ;; |
| 82 | *) |
| 83 | die "Bad HEAD - strange symbolic ref" |
| 84 | ;; |
| 85 | esac |
| 86 | fi |
| 87 | |
| 88 | # |
| 89 | # Get rid of any old bisect state. |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 90 | # |
Christian Couder | 823ea12 | 2008-05-28 18:57:02 +0200 | [diff] [blame] | 91 | bisect_clean_state || exit |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 92 | |
| 93 | # |
| 94 | # Check for one bad and then some good revisions. |
| 95 | # |
| 96 | has_double_dash=0 |
| 97 | for arg; do |
| 98 | case "$arg" in --) has_double_dash=1; break ;; esac |
| 99 | done |
Christian Couder | de52f5a | 2009-04-24 08:29:00 +0200 | [diff] [blame] | 100 | orig_args=$(git rev-parse --sq-quote "$@") |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 101 | bad_seen=0 |
Christian Couder | d3e54c8 | 2008-04-14 05:41:45 +0200 | [diff] [blame] | 102 | eval='' |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 103 | while [ $# -gt 0 ]; do |
| 104 | arg="$1" |
| 105 | case "$arg" in |
| 106 | --) |
Christian Couder | 8fe26f4 | 2007-10-22 07:48:23 +0200 | [diff] [blame] | 107 | shift |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 108 | break |
| 109 | ;; |
| 110 | *) |
Christian Couder | 634f246 | 2008-05-23 01:28:57 +0200 | [diff] [blame] | 111 | rev=$(git rev-parse -q --verify "$arg^{commit}") || { |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 112 | test $has_double_dash -eq 1 && |
| 113 | die "'$arg' does not appear to be a valid revision" |
| 114 | break |
| 115 | } |
Christian Couder | 737c74e | 2007-10-24 07:01:13 +0200 | [diff] [blame] | 116 | case $bad_seen in |
| 117 | 0) state='bad' ; bad_seen=1 ;; |
| 118 | *) state='good' ;; |
| 119 | esac |
Christian Couder | d3e54c8 | 2008-04-14 05:41:45 +0200 | [diff] [blame] | 120 | eval="$eval bisect_write '$state' '$rev' 'nolog'; " |
Christian Couder | 8fe26f4 | 2007-10-22 07:48:23 +0200 | [diff] [blame] | 121 | shift |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 122 | ;; |
| 123 | esac |
Christian Couder | 8fe26f4 | 2007-10-22 07:48:23 +0200 | [diff] [blame] | 124 | done |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 125 | |
Christian Couder | ba963de | 2008-05-23 00:39:22 +0200 | [diff] [blame] | 126 | # |
| 127 | # Change state. |
| 128 | # In case of mistaken revs or checkout error, or signals received, |
| 129 | # "bisect_auto_next" below may exit or misbehave. |
| 130 | # We have to trap this to be able to clean up using |
| 131 | # "bisect_clean_state". |
| 132 | # |
| 133 | trap 'bisect_clean_state' 0 |
| 134 | trap 'exit 255' 1 2 3 15 |
| 135 | |
| 136 | # |
| 137 | # Write new start state. |
| 138 | # |
Christian Couder | ba963de | 2008-05-23 00:39:22 +0200 | [diff] [blame] | 139 | echo "$start_head" >"$GIT_DIR/BISECT_START" && |
Christian Couder | de52f5a | 2009-04-24 08:29:00 +0200 | [diff] [blame] | 140 | git rev-parse --sq-quote "$@" >"$GIT_DIR/BISECT_NAMES" && |
Christian Couder | ba963de | 2008-05-23 00:39:22 +0200 | [diff] [blame] | 141 | eval "$eval" && |
Miklos Vajna | 6c98c05 | 2008-07-11 18:01:29 +0200 | [diff] [blame] | 142 | echo "git bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG" || exit |
Christian Couder | ba963de | 2008-05-23 00:39:22 +0200 | [diff] [blame] | 143 | # |
| 144 | # Check if we can proceed to the next bisect state. |
| 145 | # |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 146 | bisect_auto_next |
Christian Couder | ba963de | 2008-05-23 00:39:22 +0200 | [diff] [blame] | 147 | |
| 148 | trap '-' 0 |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 149 | } |
| 150 | |
Christian Couder | 55624f9 | 2007-10-24 07:01:05 +0200 | [diff] [blame] | 151 | bisect_write() { |
| 152 | state="$1" |
| 153 | rev="$2" |
Christian Couder | 737c74e | 2007-10-24 07:01:13 +0200 | [diff] [blame] | 154 | nolog="$3" |
Christian Couder | 55624f9 | 2007-10-24 07:01:05 +0200 | [diff] [blame] | 155 | case "$state" in |
| 156 | bad) tag="$state" ;; |
| 157 | good|skip) tag="$state"-"$rev" ;; |
| 158 | *) die "Bad bisect_write argument: $state" ;; |
| 159 | esac |
Christian Couder | ba963de | 2008-05-23 00:39:22 +0200 | [diff] [blame] | 160 | git update-ref "refs/bisect/$tag" "$rev" || exit |
Johannes Schindelin | f454cdc | 2008-02-12 19:50:57 +0000 | [diff] [blame] | 161 | echo "# $state: $(git show-branch $rev)" >>"$GIT_DIR/BISECT_LOG" |
Miklos Vajna | 6c98c05 | 2008-07-11 18:01:29 +0200 | [diff] [blame] | 162 | test -n "$nolog" || echo "git bisect $state $rev" >>"$GIT_DIR/BISECT_LOG" |
Christian Couder | 55624f9 | 2007-10-24 07:01:05 +0200 | [diff] [blame] | 163 | } |
| 164 | |
Christian Couder | c9c4e2d | 2008-08-22 05:52:29 +0200 | [diff] [blame] | 165 | is_expected_rev() { |
| 166 | test -f "$GIT_DIR/BISECT_EXPECTED_REV" && |
| 167 | test "$1" = $(cat "$GIT_DIR/BISECT_EXPECTED_REV") |
| 168 | } |
| 169 | |
Christian Couder | c9c4e2d | 2008-08-22 05:52:29 +0200 | [diff] [blame] | 170 | check_expected_revs() { |
| 171 | for _rev in "$@"; do |
| 172 | if ! is_expected_rev "$_rev"; then |
| 173 | rm -f "$GIT_DIR/BISECT_ANCESTORS_OK" |
| 174 | rm -f "$GIT_DIR/BISECT_EXPECTED_REV" |
| 175 | return |
| 176 | fi |
| 177 | done |
| 178 | } |
| 179 | |
Christian Couder | ee2314f | 2008-11-23 22:02:49 +0100 | [diff] [blame] | 180 | bisect_skip() { |
| 181 | all='' |
| 182 | for arg in "$@" |
| 183 | do |
| 184 | case "$arg" in |
| 185 | *..*) |
| 186 | revs=$(git rev-list "$arg") || die "Bad rev input: $arg" ;; |
| 187 | *) |
Christian Couder | de52f5a | 2009-04-24 08:29:00 +0200 | [diff] [blame] | 188 | revs=$(git rev-parse --sq-quote "$arg") ;; |
Christian Couder | ee2314f | 2008-11-23 22:02:49 +0100 | [diff] [blame] | 189 | esac |
| 190 | all="$all $revs" |
| 191 | done |
Christian Couder | 1a66a48 | 2008-12-02 14:53:47 +0100 | [diff] [blame] | 192 | eval bisect_state 'skip' $all |
Christian Couder | ee2314f | 2008-11-23 22:02:49 +0100 | [diff] [blame] | 193 | } |
| 194 | |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 195 | bisect_state() { |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 196 | bisect_autostart |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 197 | state=$1 |
| 198 | case "$#,$state" in |
| 199 | 0,*) |
| 200 | die "Please call 'bisect_state' with at least one argument." ;; |
| 201 | 1,bad|1,good|1,skip) |
| 202 | rev=$(git rev-parse --verify HEAD) || |
| 203 | die "Bad rev input: HEAD" |
Christian Couder | c9c4e2d | 2008-08-22 05:52:29 +0200 | [diff] [blame] | 204 | bisect_write "$state" "$rev" |
| 205 | check_expected_revs "$rev" ;; |
Christian Couder | e338907 | 2008-04-12 07:53:59 +0200 | [diff] [blame] | 206 | 2,bad|*,good|*,skip) |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 207 | shift |
Christian Couder | d3e54c8 | 2008-04-14 05:41:45 +0200 | [diff] [blame] | 208 | eval='' |
Christian Couder | e338907 | 2008-04-12 07:53:59 +0200 | [diff] [blame] | 209 | for rev in "$@" |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 210 | do |
Christian Couder | a179a30 | 2008-04-12 02:17:36 -0700 | [diff] [blame] | 211 | sha=$(git rev-parse --verify "$rev^{commit}") || |
Christian Couder | e338907 | 2008-04-12 07:53:59 +0200 | [diff] [blame] | 212 | die "Bad rev input: $rev" |
Christian Couder | d3e54c8 | 2008-04-14 05:41:45 +0200 | [diff] [blame] | 213 | eval="$eval bisect_write '$state' '$sha'; " |
| 214 | done |
Christian Couder | c9c4e2d | 2008-08-22 05:52:29 +0200 | [diff] [blame] | 215 | eval "$eval" |
| 216 | check_expected_revs "$@" ;; |
Christian Couder | e338907 | 2008-04-12 07:53:59 +0200 | [diff] [blame] | 217 | *,bad) |
| 218 | die "'git bisect bad' can take only one argument." ;; |
Junio C Hamano | cc9f24d | 2005-08-30 12:45:41 -0700 | [diff] [blame] | 219 | *) |
| 220 | usage ;; |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 221 | esac |
Christian Couder | 97e1c51 | 2007-10-22 07:48:36 +0200 | [diff] [blame] | 222 | bisect_auto_next |
| 223 | } |
| 224 | |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 225 | bisect_next_check() { |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 226 | missing_good= missing_bad= |
| 227 | git show-ref -q --verify refs/bisect/bad || missing_bad=t |
| 228 | test -n "$(git for-each-ref "refs/bisect/good-*")" || missing_good=t |
Junio C Hamano | 6fecf19 | 2007-04-05 22:51:14 -0700 | [diff] [blame] | 229 | |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 230 | case "$missing_good,$missing_bad,$1" in |
| 231 | ,,*) |
| 232 | : have both good and bad - ok |
| 233 | ;; |
| 234 | *,) |
| 235 | # do not have both but not asked to fail - just report. |
| 236 | false |
| 237 | ;; |
| 238 | t,,good) |
| 239 | # have bad but not good. we could bisect although |
| 240 | # this is less optimum. |
| 241 | echo >&2 'Warning: bisecting only with a bad commit.' |
| 242 | if test -t 0 |
| 243 | then |
| 244 | printf >&2 'Are you sure [Y/n]? ' |
Francis Moreau | e5d3afd | 2008-08-11 19:37:46 +0200 | [diff] [blame] | 245 | read yesno |
| 246 | case "$yesno" in [Nn]*) exit 1 ;; esac |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 247 | fi |
| 248 | : bisect without good... |
| 249 | ;; |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 250 | *) |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 251 | THEN='' |
Christian Couder | 823ea12 | 2008-05-28 18:57:02 +0200 | [diff] [blame] | 252 | test -s "$GIT_DIR/BISECT_START" || { |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 253 | echo >&2 'You need to start by "git bisect start".' |
| 254 | THEN='then ' |
| 255 | } |
| 256 | echo >&2 'You '$THEN'need to give me at least one good' \ |
| 257 | 'and one bad revisions.' |
| 258 | echo >&2 '(You can use "git bisect bad" and' \ |
| 259 | '"git bisect good" for that.)' |
| 260 | exit 1 ;; |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 261 | esac |
| 262 | } |
| 263 | |
| 264 | bisect_auto_next() { |
Junio C Hamano | 434d036 | 2005-09-17 13:51:03 -0700 | [diff] [blame] | 265 | bisect_next_check && bisect_next || : |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 266 | } |
| 267 | |
| 268 | bisect_next() { |
Christian Couder | 8fe26f4 | 2007-10-22 07:48:23 +0200 | [diff] [blame] | 269 | case "$#" in 0) ;; *) usage ;; esac |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 270 | bisect_autostart |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 271 | bisect_next_check good |
| 272 | |
Christian Couder | 0871984 | 2009-05-09 17:55:47 +0200 | [diff] [blame] | 273 | # Perform all bisection computation, display and checkout |
| 274 | git bisect--helper --next-all |
Christian Couder | 5a1d31c | 2009-04-19 11:56:16 +0200 | [diff] [blame] | 275 | res=$? |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 276 | |
Christian Couder | 5a1d31c | 2009-04-19 11:56:16 +0200 | [diff] [blame] | 277 | # Check if we should exit because bisection is finished |
| 278 | test $res -eq 10 && exit 0 |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 279 | |
Christian Couder | 5a1d31c | 2009-04-19 11:56:16 +0200 | [diff] [blame] | 280 | # Check for an error in the bisection process |
| 281 | test $res -ne 0 && exit $res |
| 282 | |
| 283 | return 0 |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 284 | } |
| 285 | |
Junio C Hamano | cc9f24d | 2005-08-30 12:45:41 -0700 | [diff] [blame] | 286 | bisect_visualize() { |
| 287 | bisect_next_check fail |
Junio C Hamano | 235997c | 2007-12-07 02:25:34 -0800 | [diff] [blame] | 288 | |
| 289 | if test $# = 0 |
| 290 | then |
Johannes Schindelin | 22b3ddd | 2009-01-02 19:08:00 +0100 | [diff] [blame] | 291 | case "${DISPLAY+set}${SESSIONNAME+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" in |
Junio C Hamano | 235997c | 2007-12-07 02:25:34 -0800 | [diff] [blame] | 292 | '') set git log ;; |
Johannes Schindelin | 508e84a | 2008-02-14 12:29:58 +0000 | [diff] [blame] | 293 | set*) set gitk ;; |
Junio C Hamano | 235997c | 2007-12-07 02:25:34 -0800 | [diff] [blame] | 294 | esac |
| 295 | else |
| 296 | case "$1" in |
| 297 | git*|tig) ;; |
| 298 | -*) set git log "$@" ;; |
| 299 | *) set git "$@" ;; |
| 300 | esac |
| 301 | fi |
| 302 | |
Christian Couder | fc13aa3 | 2009-11-23 05:16:14 +0100 | [diff] [blame] | 303 | eval '"$@"' --bisect -- $(cat "$GIT_DIR/BISECT_NAMES") |
Junio C Hamano | cc9f24d | 2005-08-30 12:45:41 -0700 | [diff] [blame] | 304 | } |
| 305 | |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 306 | bisect_reset() { |
Christian Couder | 823ea12 | 2008-05-28 18:57:02 +0200 | [diff] [blame] | 307 | test -s "$GIT_DIR/BISECT_START" || { |
Christian Couder | fce0499 | 2007-11-20 06:39:53 +0100 | [diff] [blame] | 308 | echo "We are not bisecting." |
| 309 | return |
| 310 | } |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 311 | case "$#" in |
Christian Couder | 823ea12 | 2008-05-28 18:57:02 +0200 | [diff] [blame] | 312 | 0) branch=$(cat "$GIT_DIR/BISECT_START") ;; |
Anders Kaseorg | 6b87ce2 | 2009-10-13 17:02:24 -0400 | [diff] [blame] | 313 | 1) git rev-parse --quiet --verify "$1^{commit}" > /dev/null || |
| 314 | die "'$1' is not a valid commit" |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 315 | branch="$1" ;; |
Christian Couder | 8fe26f4 | 2007-10-22 07:48:23 +0200 | [diff] [blame] | 316 | *) |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 317 | usage ;; |
| 318 | esac |
Christian Couder | f3a186f | 2009-04-04 22:02:26 +0200 | [diff] [blame] | 319 | git checkout "$branch" -- && bisect_clean_state |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 320 | } |
| 321 | |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 322 | bisect_clean_state() { |
Christian Couder | 947a604 | 2007-11-15 08:18:07 +0100 | [diff] [blame] | 323 | # There may be some refs packed during bisection. |
Christian Couder | 634f246 | 2008-05-23 01:28:57 +0200 | [diff] [blame] | 324 | git for-each-ref --format='%(refname) %(objectname)' refs/bisect/\* | |
Christian Couder | 947a604 | 2007-11-15 08:18:07 +0100 | [diff] [blame] | 325 | while read ref hash |
| 326 | do |
Christian Couder | 823ea12 | 2008-05-28 18:57:02 +0200 | [diff] [blame] | 327 | git update-ref -d $ref $hash || exit |
Christian Couder | 947a604 | 2007-11-15 08:18:07 +0100 | [diff] [blame] | 328 | done |
Christian Couder | c9c4e2d | 2008-08-22 05:52:29 +0200 | [diff] [blame] | 329 | rm -f "$GIT_DIR/BISECT_EXPECTED_REV" && |
| 330 | rm -f "$GIT_DIR/BISECT_ANCESTORS_OK" && |
Christian Couder | 823ea12 | 2008-05-28 18:57:02 +0200 | [diff] [blame] | 331 | rm -f "$GIT_DIR/BISECT_LOG" && |
| 332 | rm -f "$GIT_DIR/BISECT_NAMES" && |
| 333 | rm -f "$GIT_DIR/BISECT_RUN" && |
Christian Couder | 9d0cd91 | 2008-05-23 00:38:59 +0200 | [diff] [blame] | 334 | # Cleanup head-name if it got left by an old version of git-bisect |
Christian Couder | 823ea12 | 2008-05-28 18:57:02 +0200 | [diff] [blame] | 335 | rm -f "$GIT_DIR/head-name" && |
| 336 | |
| 337 | rm -f "$GIT_DIR/BISECT_START" |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 338 | } |
| 339 | |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 340 | bisect_replay () { |
Christian Couder | 737c74e | 2007-10-24 07:01:13 +0200 | [diff] [blame] | 341 | test -r "$1" || die "cannot read $1 for replaying" |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 342 | bisect_reset |
Miklos Vajna | 6c98c05 | 2008-07-11 18:01:29 +0200 | [diff] [blame] | 343 | while read git bisect command rev |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 344 | do |
Miklos Vajna | 6c98c05 | 2008-07-11 18:01:29 +0200 | [diff] [blame] | 345 | test "$git $bisect" = "git bisect" -o "$git" = "git-bisect" || continue |
| 346 | if test "$git" = "git-bisect"; then |
| 347 | rev="$command" |
| 348 | command="$bisect" |
| 349 | fi |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 350 | case "$command" in |
| 351 | start) |
Junio C Hamano | e9a45d7 | 2005-11-27 17:42:05 -0800 | [diff] [blame] | 352 | cmd="bisect_start $rev" |
Christian Couder | 737c74e | 2007-10-24 07:01:13 +0200 | [diff] [blame] | 353 | eval "$cmd" ;; |
| 354 | good|bad|skip) |
| 355 | bisect_write "$command" "$rev" ;; |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 356 | *) |
Christian Couder | 737c74e | 2007-10-24 07:01:13 +0200 | [diff] [blame] | 357 | die "?? what are you talking about?" ;; |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 358 | esac |
| 359 | done <"$1" |
| 360 | bisect_auto_next |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 361 | } |
| 362 | |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 363 | bisect_run () { |
Christian Couder | 8302012 | 2007-03-27 06:49:57 +0200 | [diff] [blame] | 364 | bisect_next_check fail |
| 365 | |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 366 | while true |
| 367 | do |
| 368 | echo "running $@" |
| 369 | "$@" |
| 370 | res=$? |
| 371 | |
| 372 | # Check for really bad run error. |
| 373 | if [ $res -lt 0 -o $res -ge 128 ]; then |
| 374 | echo >&2 "bisect run failed:" |
| 375 | echo >&2 "exit code $res from '$@' is < 0 or >= 128" |
| 376 | exit $res |
| 377 | fi |
| 378 | |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 379 | # Find current state depending on run success or failure. |
Christian Couder | 71b0251 | 2007-10-26 05:39:37 +0200 | [diff] [blame] | 380 | # A special exit code of 125 means cannot test. |
| 381 | if [ $res -eq 125 ]; then |
| 382 | state='skip' |
| 383 | elif [ $res -gt 0 ]; then |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 384 | state='bad' |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 385 | else |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 386 | state='good' |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 387 | fi |
| 388 | |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 389 | # We have to use a subshell because "bisect_state" can exit. |
| 390 | ( bisect_state $state > "$GIT_DIR/BISECT_RUN" ) |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 391 | res=$? |
| 392 | |
| 393 | cat "$GIT_DIR/BISECT_RUN" |
| 394 | |
Junio C Hamano | e1622bf | 2009-11-23 15:56:32 -0800 | [diff] [blame] | 395 | if sane_grep "first bad commit could be any of" "$GIT_DIR/BISECT_RUN" \ |
Christian Couder | 71b0251 | 2007-10-26 05:39:37 +0200 | [diff] [blame] | 396 | > /dev/null; then |
| 397 | echo >&2 "bisect run cannot continue any more" |
| 398 | exit $res |
| 399 | fi |
| 400 | |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 401 | if [ $res -ne 0 ]; then |
| 402 | echo >&2 "bisect run failed:" |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 403 | echo >&2 "'bisect_state $state' exited with error code $res" |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 404 | exit $res |
| 405 | fi |
| 406 | |
Junio C Hamano | e1622bf | 2009-11-23 15:56:32 -0800 | [diff] [blame] | 407 | if sane_grep "is the first bad commit" "$GIT_DIR/BISECT_RUN" > /dev/null; then |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 408 | echo "bisect run success" |
| 409 | exit 0; |
| 410 | fi |
| 411 | |
| 412 | done |
| 413 | } |
| 414 | |
| 415 | |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 416 | case "$#" in |
| 417 | 0) |
| 418 | usage ;; |
| 419 | *) |
| 420 | cmd="$1" |
| 421 | shift |
| 422 | case "$cmd" in |
Christian Couder | 243a60f | 2008-04-11 05:55:21 +0200 | [diff] [blame] | 423 | help) |
| 424 | git bisect -h ;; |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 425 | start) |
| 426 | bisect_start "$@" ;; |
Christian Couder | ee2314f | 2008-11-23 22:02:49 +0100 | [diff] [blame] | 427 | bad|good) |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 428 | bisect_state "$cmd" "$@" ;; |
Christian Couder | ee2314f | 2008-11-23 22:02:49 +0100 | [diff] [blame] | 429 | skip) |
| 430 | bisect_skip "$@" ;; |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 431 | next) |
| 432 | # Not sure we want "next" at the UI level anymore. |
| 433 | bisect_next "$@" ;; |
Junio C Hamano | 235997c | 2007-12-07 02:25:34 -0800 | [diff] [blame] | 434 | visualize|view) |
Junio C Hamano | cc9f24d | 2005-08-30 12:45:41 -0700 | [diff] [blame] | 435 | bisect_visualize "$@" ;; |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 436 | reset) |
| 437 | bisect_reset "$@" ;; |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 438 | replay) |
| 439 | bisect_replay "$@" ;; |
| 440 | log) |
| 441 | cat "$GIT_DIR/BISECT_LOG" ;; |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 442 | run) |
| 443 | bisect_run "$@" ;; |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 444 | *) |
| 445 | usage ;; |
| 446 | esac |
| 447 | esac |