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 | |
Matthieu Moy | 21b55e3 | 2015-06-29 17:40:34 +0200 | [diff] [blame] | 3 | USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|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. |
Matthieu Moy | 06e6a74 | 2015-06-29 17:40:35 +0200 | [diff] [blame] | 6 | git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>] |
| 7 | [--no-checkout] [<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. |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 23 | git bisect visualize |
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 | |
Jon Seymour | 4796e82 | 2011-08-04 22:01:01 +1000 | [diff] [blame] | 42 | bisect_head() |
| 43 | { |
| 44 | if test -f "$GIT_DIR/BISECT_HEAD" |
| 45 | then |
| 46 | echo BISECT_HEAD |
| 47 | else |
| 48 | echo HEAD |
| 49 | fi |
| 50 | } |
| 51 | |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 52 | bisect_autostart() { |
Christian Couder | 823ea12 | 2008-05-28 18:57:02 +0200 | [diff] [blame] | 53 | test -s "$GIT_DIR/BISECT_START" || { |
Jon Seymour | 3145b1a | 2011-08-31 09:09:47 +1000 | [diff] [blame] | 54 | gettextln "You need to start by \"git bisect start\"" >&2 |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 55 | if test -t 0 |
| 56 | then |
Ævar Arnfjörð Bjarmason | 04de099 | 2011-05-21 18:44:28 +0000 | [diff] [blame] | 57 | # TRANSLATORS: Make sure to include [Y] and [n] in your |
| 58 | # translation. The program will only accept English input |
| 59 | # at this point. |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 60 | gettext "Do you want me to do it for you [Y/n]? " >&2 |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 61 | read yesno |
| 62 | case "$yesno" in |
| 63 | [Nn]*) |
| 64 | exit ;; |
| 65 | esac |
| 66 | bisect_start |
| 67 | else |
| 68 | exit 1 |
| 69 | fi |
| 70 | } |
| 71 | } |
| 72 | |
| 73 | bisect_start() { |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 74 | # |
Jon Seymour | 4764f46 | 2011-08-04 22:00:57 +1000 | [diff] [blame] | 75 | # Check for one bad and then some good revisions. |
| 76 | # |
| 77 | has_double_dash=0 |
| 78 | for arg; do |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 79 | case "$arg" in --) has_double_dash=1; break ;; esac |
Jon Seymour | 4764f46 | 2011-08-04 22:00:57 +1000 | [diff] [blame] | 80 | done |
| 81 | orig_args=$(git rev-parse --sq-quote "$@") |
| 82 | bad_seen=0 |
| 83 | eval='' |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 84 | must_write_terms=0 |
Matthieu Moy | 4a6ada3 | 2015-06-29 17:40:31 +0200 | [diff] [blame] | 85 | revs='' |
Jon Seymour | 24c5128 | 2011-08-09 12:11:54 +1000 | [diff] [blame] | 86 | if test "z$(git rev-parse --is-bare-repository)" != zfalse |
| 87 | then |
| 88 | mode=--no-checkout |
| 89 | else |
| 90 | mode='' |
| 91 | fi |
Jon Seymour | 4764f46 | 2011-08-04 22:00:57 +1000 | [diff] [blame] | 92 | while [ $# -gt 0 ]; do |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 93 | arg="$1" |
| 94 | case "$arg" in |
| 95 | --) |
| 96 | shift |
| 97 | break |
Jon Seymour | 4764f46 | 2011-08-04 22:00:57 +1000 | [diff] [blame] | 98 | ;; |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 99 | --no-checkout) |
| 100 | mode=--no-checkout |
| 101 | shift ;; |
Matthieu Moy | 06e6a74 | 2015-06-29 17:40:35 +0200 | [diff] [blame] | 102 | --term-good|--term-old) |
| 103 | shift |
| 104 | must_write_terms=1 |
| 105 | TERM_GOOD=$1 |
| 106 | shift ;; |
| 107 | --term-good=*|--term-old=*) |
| 108 | must_write_terms=1 |
| 109 | TERM_GOOD=${1#*=} |
| 110 | shift ;; |
| 111 | --term-bad|--term-new) |
| 112 | shift |
| 113 | must_write_terms=1 |
| 114 | TERM_BAD=$1 |
| 115 | shift ;; |
| 116 | --term-bad=*|--term-new=*) |
| 117 | must_write_terms=1 |
| 118 | TERM_BAD=${1#*=} |
| 119 | shift ;; |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 120 | --*) |
| 121 | die "$(eval_gettext "unrecognised option: '\$arg'")" ;; |
| 122 | *) |
| 123 | rev=$(git rev-parse -q --verify "$arg^{commit}") || { |
Junio C Hamano | 43b8ff4 | 2011-08-05 10:09:23 -0700 | [diff] [blame] | 124 | test $has_double_dash -eq 1 && |
| 125 | die "$(eval_gettext "'\$arg' does not appear to be a valid revision")" |
| 126 | break |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 127 | } |
Matthieu Moy | 4a6ada3 | 2015-06-29 17:40:31 +0200 | [diff] [blame] | 128 | revs="$revs $rev" |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 129 | shift |
| 130 | ;; |
Jon Seymour | 4764f46 | 2011-08-04 22:00:57 +1000 | [diff] [blame] | 131 | esac |
Jon Seymour | 4764f46 | 2011-08-04 22:00:57 +1000 | [diff] [blame] | 132 | done |
| 133 | |
Matthieu Moy | 4a6ada3 | 2015-06-29 17:40:31 +0200 | [diff] [blame] | 134 | for rev in $revs |
| 135 | do |
| 136 | # The user ran "git bisect start <sha1> |
| 137 | # <sha1>", hence did not explicitly specify |
| 138 | # the terms, but we are already starting to |
| 139 | # set references named with the default terms, |
| 140 | # and won't be able to change afterwards. |
| 141 | must_write_terms=1 |
| 142 | |
| 143 | case $bad_seen in |
| 144 | 0) state=$TERM_BAD ; bad_seen=1 ;; |
| 145 | *) state=$TERM_GOOD ;; |
| 146 | esac |
| 147 | eval="$eval bisect_write '$state' '$rev' 'nolog' &&" |
| 148 | done |
Jon Seymour | 4764f46 | 2011-08-04 22:00:57 +1000 | [diff] [blame] | 149 | # |
Christian Couder | 634f246 | 2008-05-23 01:28:57 +0200 | [diff] [blame] | 150 | # Verify HEAD. |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 151 | # |
Christian Couder | 48949a1 | 2008-04-16 04:09:49 +0200 | [diff] [blame] | 152 | head=$(GIT_DIR="$GIT_DIR" git symbolic-ref -q HEAD) || |
Johannes Schindelin | ce32660 | 2008-02-10 13:59:50 +0000 | [diff] [blame] | 153 | head=$(GIT_DIR="$GIT_DIR" git rev-parse --verify HEAD) || |
Ævar Arnfjörð Bjarmason | 9570fc1 | 2011-05-21 18:44:23 +0000 | [diff] [blame] | 154 | die "$(gettext "Bad HEAD - I need a HEAD")" |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 155 | |
| 156 | # |
Christian Couder | 634f246 | 2008-05-23 01:28:57 +0200 | [diff] [blame] | 157 | # Check if we are bisecting. |
| 158 | # |
| 159 | start_head='' |
| 160 | if test -s "$GIT_DIR/BISECT_START" |
| 161 | then |
| 162 | # Reset to the rev from where we started. |
| 163 | start_head=$(cat "$GIT_DIR/BISECT_START") |
Jon Seymour | 4796e82 | 2011-08-04 22:01:01 +1000 | [diff] [blame] | 164 | if test "z$mode" != "z--no-checkout" |
| 165 | then |
Christian Couder | 1acf117 | 2011-09-21 07:17:24 +0200 | [diff] [blame] | 166 | git checkout "$start_head" -- || |
Alex Henrie | 9c9b4f2 | 2015-01-13 00:44:47 -0700 | [diff] [blame] | 167 | die "$(eval_gettext "Checking out '\$start_head' failed. Try 'git bisect reset <valid-branch>'.")" |
Jon Seymour | 4796e82 | 2011-08-04 22:01:01 +1000 | [diff] [blame] | 168 | fi |
Christian Couder | 634f246 | 2008-05-23 01:28:57 +0200 | [diff] [blame] | 169 | else |
| 170 | # Get rev from where we start. |
| 171 | case "$head" in |
| 172 | refs/heads/*|$_x40) |
| 173 | # This error message should only be triggered by |
| 174 | # cogito usage, and cogito users should understand |
| 175 | # it relates to cg-seek. |
| 176 | [ -s "$GIT_DIR/head-name" ] && |
Masanari Iida | 382d20e | 2013-11-13 00:17:42 +0900 | [diff] [blame] | 177 | die "$(gettext "won't bisect on cg-seek'ed tree")" |
Christian Couder | 634f246 | 2008-05-23 01:28:57 +0200 | [diff] [blame] | 178 | start_head="${head#refs/heads/}" |
| 179 | ;; |
| 180 | *) |
Ævar Arnfjörð Bjarmason | 9570fc1 | 2011-05-21 18:44:23 +0000 | [diff] [blame] | 181 | die "$(gettext "Bad HEAD - strange symbolic ref")" |
Christian Couder | 634f246 | 2008-05-23 01:28:57 +0200 | [diff] [blame] | 182 | ;; |
| 183 | esac |
| 184 | fi |
| 185 | |
| 186 | # |
| 187 | # Get rid of any old bisect state. |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 188 | # |
Christian Couder | 823ea12 | 2008-05-28 18:57:02 +0200 | [diff] [blame] | 189 | bisect_clean_state || exit |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 190 | |
| 191 | # |
Christian Couder | ba963de | 2008-05-23 00:39:22 +0200 | [diff] [blame] | 192 | # Change state. |
| 193 | # In case of mistaken revs or checkout error, or signals received, |
| 194 | # "bisect_auto_next" below may exit or misbehave. |
| 195 | # We have to trap this to be able to clean up using |
| 196 | # "bisect_clean_state". |
| 197 | # |
| 198 | trap 'bisect_clean_state' 0 |
| 199 | trap 'exit 255' 1 2 3 15 |
| 200 | |
| 201 | # |
| 202 | # Write new start state. |
| 203 | # |
Jon Seymour | 4796e82 | 2011-08-04 22:01:01 +1000 | [diff] [blame] | 204 | echo "$start_head" >"$GIT_DIR/BISECT_START" && { |
| 205 | test "z$mode" != "z--no-checkout" || |
| 206 | git update-ref --no-deref BISECT_HEAD "$start_head" |
| 207 | } && |
Christian Couder | de52f5a | 2009-04-24 08:29:00 +0200 | [diff] [blame] | 208 | git rev-parse --sq-quote "$@" >"$GIT_DIR/BISECT_NAMES" && |
Jon Seymour | 6ba7acf | 2011-08-04 22:00:58 +1000 | [diff] [blame] | 209 | eval "$eval true" && |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 210 | if test $must_write_terms -eq 1 |
| 211 | then |
| 212 | write_terms "$TERM_BAD" "$TERM_GOOD" |
| 213 | fi && |
Miklos Vajna | 6c98c05 | 2008-07-11 18:01:29 +0200 | [diff] [blame] | 214 | echo "git bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG" || exit |
Christian Couder | ba963de | 2008-05-23 00:39:22 +0200 | [diff] [blame] | 215 | # |
| 216 | # Check if we can proceed to the next bisect state. |
| 217 | # |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 218 | bisect_auto_next |
Christian Couder | ba963de | 2008-05-23 00:39:22 +0200 | [diff] [blame] | 219 | |
| 220 | trap '-' 0 |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 221 | } |
| 222 | |
Christian Couder | 55624f9 | 2007-10-24 07:01:05 +0200 | [diff] [blame] | 223 | bisect_write() { |
| 224 | state="$1" |
| 225 | rev="$2" |
Christian Couder | 737c74e | 2007-10-24 07:01:13 +0200 | [diff] [blame] | 226 | nolog="$3" |
Christian Couder | 55624f9 | 2007-10-24 07:01:05 +0200 | [diff] [blame] | 227 | case "$state" in |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 228 | "$TERM_BAD") |
| 229 | tag="$state" ;; |
| 230 | "$TERM_GOOD"|skip) |
| 231 | tag="$state"-"$rev" ;; |
| 232 | *) |
| 233 | die "$(eval_gettext "Bad bisect_write argument: \$state")" ;; |
Christian Couder | 55624f9 | 2007-10-24 07:01:05 +0200 | [diff] [blame] | 234 | esac |
Christian Couder | ba963de | 2008-05-23 00:39:22 +0200 | [diff] [blame] | 235 | git update-ref "refs/bisect/$tag" "$rev" || exit |
Johannes Schindelin | f454cdc | 2008-02-12 19:50:57 +0000 | [diff] [blame] | 236 | echo "# $state: $(git show-branch $rev)" >>"$GIT_DIR/BISECT_LOG" |
Miklos Vajna | 6c98c05 | 2008-07-11 18:01:29 +0200 | [diff] [blame] | 237 | test -n "$nolog" || echo "git bisect $state $rev" >>"$GIT_DIR/BISECT_LOG" |
Christian Couder | 55624f9 | 2007-10-24 07:01:05 +0200 | [diff] [blame] | 238 | } |
| 239 | |
Christian Couder | c9c4e2d | 2008-08-22 05:52:29 +0200 | [diff] [blame] | 240 | is_expected_rev() { |
| 241 | test -f "$GIT_DIR/BISECT_EXPECTED_REV" && |
| 242 | test "$1" = $(cat "$GIT_DIR/BISECT_EXPECTED_REV") |
| 243 | } |
| 244 | |
Christian Couder | c9c4e2d | 2008-08-22 05:52:29 +0200 | [diff] [blame] | 245 | check_expected_revs() { |
| 246 | for _rev in "$@"; do |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 247 | if ! is_expected_rev "$_rev" |
| 248 | then |
Christian Couder | c9c4e2d | 2008-08-22 05:52:29 +0200 | [diff] [blame] | 249 | rm -f "$GIT_DIR/BISECT_ANCESTORS_OK" |
| 250 | rm -f "$GIT_DIR/BISECT_EXPECTED_REV" |
| 251 | return |
| 252 | fi |
| 253 | done |
| 254 | } |
| 255 | |
Christian Couder | ee2314f | 2008-11-23 22:02:49 +0100 | [diff] [blame] | 256 | bisect_skip() { |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 257 | all='' |
Christian Couder | ee2314f | 2008-11-23 22:02:49 +0100 | [diff] [blame] | 258 | for arg in "$@" |
| 259 | do |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 260 | case "$arg" in |
| 261 | *..*) |
| 262 | revs=$(git rev-list "$arg") || die "$(eval_gettext "Bad rev input: \$arg")" ;; |
| 263 | *) |
| 264 | revs=$(git rev-parse --sq-quote "$arg") ;; |
| 265 | esac |
| 266 | all="$all $revs" |
| 267 | done |
| 268 | eval bisect_state 'skip' $all |
Christian Couder | ee2314f | 2008-11-23 22:02:49 +0100 | [diff] [blame] | 269 | } |
| 270 | |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 271 | bisect_state() { |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 272 | bisect_autostart |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 273 | state=$1 |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 274 | check_and_set_terms $state |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 275 | case "$#,$state" in |
| 276 | 0,*) |
Vasco Almeida | f813fb4 | 2016-06-17 21:54:14 +0000 | [diff] [blame] | 277 | die "Please call 'bisect_state' with at least one argument." ;; |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 278 | 1,"$TERM_BAD"|1,"$TERM_GOOD"|1,skip) |
Vasco Almeida | 57984dd | 2016-06-17 20:21:00 +0000 | [diff] [blame] | 279 | bisected_head=$(bisect_head) |
| 280 | rev=$(git rev-parse --verify "$bisected_head") || |
| 281 | die "$(eval_gettext "Bad rev input: \$bisected_head")" |
Christian Couder | c9c4e2d | 2008-08-22 05:52:29 +0200 | [diff] [blame] | 282 | bisect_write "$state" "$rev" |
| 283 | check_expected_revs "$rev" ;; |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 284 | 2,"$TERM_BAD"|*,"$TERM_GOOD"|*,skip) |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 285 | shift |
Christian Couder | 6bc02d5 | 2014-12-25 19:25:32 +0100 | [diff] [blame] | 286 | hash_list='' |
Christian Couder | e338907 | 2008-04-12 07:53:59 +0200 | [diff] [blame] | 287 | for rev in "$@" |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 288 | do |
Christian Couder | a179a30 | 2008-04-12 02:17:36 -0700 | [diff] [blame] | 289 | sha=$(git rev-parse --verify "$rev^{commit}") || |
Ævar Arnfjörð Bjarmason | 15eaa04 | 2011-05-21 18:44:24 +0000 | [diff] [blame] | 290 | die "$(eval_gettext "Bad rev input: \$rev")" |
Christian Couder | 6bc02d5 | 2014-12-25 19:25:32 +0100 | [diff] [blame] | 291 | hash_list="$hash_list $sha" |
Christian Couder | d3e54c8 | 2008-04-14 05:41:45 +0200 | [diff] [blame] | 292 | done |
Christian Couder | 6bc02d5 | 2014-12-25 19:25:32 +0100 | [diff] [blame] | 293 | for rev in $hash_list |
| 294 | do |
| 295 | bisect_write "$state" "$rev" |
| 296 | done |
| 297 | check_expected_revs $hash_list ;; |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 298 | *,"$TERM_BAD") |
| 299 | die "$(eval_gettext "'git bisect \$TERM_BAD' can take only one argument.")" ;; |
Junio C Hamano | cc9f24d | 2005-08-30 12:45:41 -0700 | [diff] [blame] | 300 | *) |
| 301 | usage ;; |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 302 | esac |
Christian Couder | 97e1c51 | 2007-10-22 07:48:36 +0200 | [diff] [blame] | 303 | bisect_auto_next |
| 304 | } |
| 305 | |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 306 | bisect_next_check() { |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 307 | missing_good= missing_bad= |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 308 | git show-ref -q --verify refs/bisect/$TERM_BAD || missing_bad=t |
| 309 | test -n "$(git for-each-ref "refs/bisect/$TERM_GOOD-*")" || missing_good=t |
Junio C Hamano | 6fecf19 | 2007-04-05 22:51:14 -0700 | [diff] [blame] | 310 | |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 311 | case "$missing_good,$missing_bad,$1" in |
| 312 | ,,*) |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 313 | : have both $TERM_GOOD and $TERM_BAD - ok |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 314 | ;; |
| 315 | *,) |
| 316 | # do not have both but not asked to fail - just report. |
| 317 | false |
| 318 | ;; |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 319 | t,,"$TERM_GOOD") |
Antoine Delaite | 21e5cfd | 2015-06-29 17:40:33 +0200 | [diff] [blame] | 320 | # have bad (or new) but not good (or old). we could bisect although |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 321 | # this is less optimum. |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 322 | eval_gettextln "Warning: bisecting only with a \$TERM_BAD commit." >&2 |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 323 | if test -t 0 |
| 324 | then |
Ævar Arnfjörð Bjarmason | 04de099 | 2011-05-21 18:44:28 +0000 | [diff] [blame] | 325 | # TRANSLATORS: Make sure to include [Y] and [n] in your |
| 326 | # translation. The program will only accept English input |
| 327 | # at this point. |
| 328 | gettext "Are you sure [Y/n]? " >&2 |
Francis Moreau | e5d3afd | 2008-08-11 19:37:46 +0200 | [diff] [blame] | 329 | read yesno |
| 330 | case "$yesno" in [Nn]*) exit 1 ;; esac |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 331 | fi |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 332 | : bisect without $TERM_GOOD... |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 333 | ;; |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 334 | *) |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 335 | bad_syn=$(bisect_voc bad) |
| 336 | good_syn=$(bisect_voc good) |
Ævar Arnfjörð Bjarmason | be508d3 | 2011-05-21 18:44:29 +0000 | [diff] [blame] | 337 | if test -s "$GIT_DIR/BISECT_START" |
| 338 | then |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 339 | |
| 340 | eval_gettextln "You need to give me at least one \$bad_syn and one \$good_syn revision. |
| 341 | (You can use \"git bisect \$bad_syn\" and \"git bisect \$good_syn\" for that.)" >&2 |
Ævar Arnfjörð Bjarmason | be508d3 | 2011-05-21 18:44:29 +0000 | [diff] [blame] | 342 | else |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 343 | eval_gettextln "You need to start by \"git bisect start\". |
| 344 | You then need to give me at least one \$good_syn and one \$bad_syn revision. |
| 345 | (You can use \"git bisect \$bad_syn\" and \"git bisect \$good_syn\" for that.)" >&2 |
Ævar Arnfjörð Bjarmason | be508d3 | 2011-05-21 18:44:29 +0000 | [diff] [blame] | 346 | fi |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 347 | exit 1 ;; |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 348 | esac |
| 349 | } |
| 350 | |
| 351 | bisect_auto_next() { |
Junio C Hamano | 434d036 | 2005-09-17 13:51:03 -0700 | [diff] [blame] | 352 | bisect_next_check && bisect_next || : |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 353 | } |
| 354 | |
| 355 | bisect_next() { |
Christian Couder | 8fe26f4 | 2007-10-22 07:48:23 +0200 | [diff] [blame] | 356 | case "$#" in 0) ;; *) usage ;; esac |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 357 | bisect_autostart |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 358 | bisect_next_check $TERM_GOOD |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 359 | |
Christian Couder | 0871984 | 2009-05-09 17:55:47 +0200 | [diff] [blame] | 360 | # Perform all bisection computation, display and checkout |
Jon Seymour | 4796e82 | 2011-08-04 22:01:01 +1000 | [diff] [blame] | 361 | git bisect--helper --next-all $(test -f "$GIT_DIR/BISECT_HEAD" && echo --no-checkout) |
Christian Couder | 5a1d31c | 2009-04-19 11:56:16 +0200 | [diff] [blame] | 362 | res=$? |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 363 | |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 364 | # Check if we should exit because bisection is finished |
Torstein Hegge | a7f8b8a | 2013-04-13 17:22:57 +0200 | [diff] [blame] | 365 | if test $res -eq 10 |
| 366 | then |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 367 | bad_rev=$(git show-ref --hash --verify refs/bisect/$TERM_BAD) |
Torstein Hegge | a7f8b8a | 2013-04-13 17:22:57 +0200 | [diff] [blame] | 368 | bad_commit=$(git show-branch $bad_rev) |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 369 | echo "# first $TERM_BAD commit: $bad_commit" >>"$GIT_DIR/BISECT_LOG" |
Torstein Hegge | a7f8b8a | 2013-04-13 17:22:57 +0200 | [diff] [blame] | 370 | exit 0 |
Torstein Hegge | f989cac | 2013-04-22 23:02:29 +0200 | [diff] [blame] | 371 | elif test $res -eq 2 |
| 372 | then |
| 373 | echo "# only skipped commits left to test" >>"$GIT_DIR/BISECT_LOG" |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 374 | good_revs=$(git for-each-ref --format="%(objectname)" "refs/bisect/$TERM_GOOD-*") |
| 375 | for skipped in $(git rev-list refs/bisect/$TERM_BAD --not $good_revs) |
Torstein Hegge | f989cac | 2013-04-22 23:02:29 +0200 | [diff] [blame] | 376 | do |
| 377 | skipped_commit=$(git show-branch $skipped) |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 378 | echo "# possible first $TERM_BAD commit: $skipped_commit" >>"$GIT_DIR/BISECT_LOG" |
Torstein Hegge | f989cac | 2013-04-22 23:02:29 +0200 | [diff] [blame] | 379 | done |
| 380 | exit $res |
Torstein Hegge | a7f8b8a | 2013-04-13 17:22:57 +0200 | [diff] [blame] | 381 | fi |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 382 | |
Christian Couder | 5a1d31c | 2009-04-19 11:56:16 +0200 | [diff] [blame] | 383 | # Check for an error in the bisection process |
| 384 | test $res -ne 0 && exit $res |
| 385 | |
| 386 | return 0 |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 387 | } |
| 388 | |
Junio C Hamano | cc9f24d | 2005-08-30 12:45:41 -0700 | [diff] [blame] | 389 | bisect_visualize() { |
| 390 | bisect_next_check fail |
Junio C Hamano | 235997c | 2007-12-07 02:25:34 -0800 | [diff] [blame] | 391 | |
| 392 | if test $# = 0 |
| 393 | then |
Jeff King | c4e4644e | 2011-03-21 09:14:22 -0400 | [diff] [blame] | 394 | if test -n "${DISPLAY+set}${SESSIONNAME+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" && |
Junio C Hamano | 43b8ff4 | 2011-08-05 10:09:23 -0700 | [diff] [blame] | 395 | type gitk >/dev/null 2>&1 |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 396 | then |
Jeff King | c4e4644e | 2011-03-21 09:14:22 -0400 | [diff] [blame] | 397 | set gitk |
| 398 | else |
| 399 | set git log |
| 400 | fi |
Junio C Hamano | 235997c | 2007-12-07 02:25:34 -0800 | [diff] [blame] | 401 | else |
| 402 | case "$1" in |
| 403 | git*|tig) ;; |
| 404 | -*) set git log "$@" ;; |
| 405 | *) set git "$@" ;; |
| 406 | esac |
| 407 | fi |
| 408 | |
Christian Couder | fc13aa3 | 2009-11-23 05:16:14 +0100 | [diff] [blame] | 409 | eval '"$@"' --bisect -- $(cat "$GIT_DIR/BISECT_NAMES") |
Junio C Hamano | cc9f24d | 2005-08-30 12:45:41 -0700 | [diff] [blame] | 410 | } |
| 411 | |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 412 | bisect_reset() { |
Christian Couder | 823ea12 | 2008-05-28 18:57:02 +0200 | [diff] [blame] | 413 | test -s "$GIT_DIR/BISECT_START" || { |
Jon Seymour | 3145b1a | 2011-08-31 09:09:47 +1000 | [diff] [blame] | 414 | gettextln "We are not bisecting." |
Christian Couder | fce0499 | 2007-11-20 06:39:53 +0100 | [diff] [blame] | 415 | return |
| 416 | } |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 417 | case "$#" in |
Christian Couder | 823ea12 | 2008-05-28 18:57:02 +0200 | [diff] [blame] | 418 | 0) branch=$(cat "$GIT_DIR/BISECT_START") ;; |
Jacopo Notarstefano | 305a233 | 2014-03-04 01:21:43 +0100 | [diff] [blame] | 419 | 1) git rev-parse --quiet --verify "$1^{commit}" >/dev/null || { |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 420 | invalid="$1" |
| 421 | die "$(eval_gettext "'\$invalid' is not a valid commit")" |
| 422 | } |
| 423 | branch="$1" ;; |
Christian Couder | 8fe26f4 | 2007-10-22 07:48:23 +0200 | [diff] [blame] | 424 | *) |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 425 | usage ;; |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 426 | esac |
Junio C Hamano | 43b8ff4 | 2011-08-05 10:09:23 -0700 | [diff] [blame] | 427 | |
| 428 | if ! test -f "$GIT_DIR/BISECT_HEAD" && ! git checkout "$branch" -- |
Jon Seymour | 4796e82 | 2011-08-04 22:01:01 +1000 | [diff] [blame] | 429 | then |
Junio C Hamano | 43b8ff4 | 2011-08-05 10:09:23 -0700 | [diff] [blame] | 430 | die "$(eval_gettext "Could not check out original HEAD '\$branch'. |
Ævar Arnfjörð Bjarmason | 15eaa04 | 2011-05-21 18:44:24 +0000 | [diff] [blame] | 431 | Try 'git bisect reset <commit>'.")" |
SZEDER Gábor | 3bb8cf8 | 2010-10-10 23:48:57 +0200 | [diff] [blame] | 432 | fi |
Jon Seymour | 4796e82 | 2011-08-04 22:01:01 +1000 | [diff] [blame] | 433 | bisect_clean_state |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 434 | } |
| 435 | |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 436 | bisect_clean_state() { |
Christian Couder | 947a604 | 2007-11-15 08:18:07 +0100 | [diff] [blame] | 437 | # There may be some refs packed during bisection. |
Christian Couder | 634f246 | 2008-05-23 01:28:57 +0200 | [diff] [blame] | 438 | git for-each-ref --format='%(refname) %(objectname)' refs/bisect/\* | |
Christian Couder | 947a604 | 2007-11-15 08:18:07 +0100 | [diff] [blame] | 439 | while read ref hash |
| 440 | do |
Christian Couder | 823ea12 | 2008-05-28 18:57:02 +0200 | [diff] [blame] | 441 | git update-ref -d $ref $hash || exit |
Christian Couder | 947a604 | 2007-11-15 08:18:07 +0100 | [diff] [blame] | 442 | done |
Christian Couder | c9c4e2d | 2008-08-22 05:52:29 +0200 | [diff] [blame] | 443 | rm -f "$GIT_DIR/BISECT_EXPECTED_REV" && |
| 444 | rm -f "$GIT_DIR/BISECT_ANCESTORS_OK" && |
Christian Couder | 823ea12 | 2008-05-28 18:57:02 +0200 | [diff] [blame] | 445 | rm -f "$GIT_DIR/BISECT_LOG" && |
| 446 | rm -f "$GIT_DIR/BISECT_NAMES" && |
| 447 | rm -f "$GIT_DIR/BISECT_RUN" && |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 448 | rm -f "$GIT_DIR/BISECT_TERMS" && |
Christian Couder | 9d0cd91 | 2008-05-23 00:38:59 +0200 | [diff] [blame] | 449 | # 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] | 450 | rm -f "$GIT_DIR/head-name" && |
Jon Seymour | 4796e82 | 2011-08-04 22:01:01 +1000 | [diff] [blame] | 451 | git update-ref -d --no-deref BISECT_HEAD && |
| 452 | # clean up BISECT_START last |
Christian Couder | 823ea12 | 2008-05-28 18:57:02 +0200 | [diff] [blame] | 453 | rm -f "$GIT_DIR/BISECT_START" |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 454 | } |
| 455 | |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 456 | bisect_replay () { |
Ævar Arnfjörð Bjarmason | 55a9fc8 | 2011-05-21 18:44:27 +0000 | [diff] [blame] | 457 | file="$1" |
| 458 | test "$#" -eq 1 || die "$(gettext "No logfile given")" |
| 459 | test -r "$file" || die "$(eval_gettext "cannot read \$file for replaying")" |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 460 | bisect_reset |
Miklos Vajna | 6c98c05 | 2008-07-11 18:01:29 +0200 | [diff] [blame] | 461 | while read git bisect command rev |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 462 | do |
Elia Pinto | c82af12 | 2014-06-06 07:55:50 -0700 | [diff] [blame] | 463 | test "$git $bisect" = "git bisect" || test "$git" = "git-bisect" || continue |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 464 | if test "$git" = "git-bisect" |
| 465 | then |
Miklos Vajna | 6c98c05 | 2008-07-11 18:01:29 +0200 | [diff] [blame] | 466 | rev="$command" |
| 467 | command="$bisect" |
| 468 | fi |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 469 | get_terms |
| 470 | check_and_set_terms "$command" |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 471 | case "$command" in |
| 472 | start) |
Junio C Hamano | e9a45d7 | 2005-11-27 17:42:05 -0800 | [diff] [blame] | 473 | cmd="bisect_start $rev" |
Christian Couder | 737c74e | 2007-10-24 07:01:13 +0200 | [diff] [blame] | 474 | eval "$cmd" ;; |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 475 | "$TERM_GOOD"|"$TERM_BAD"|skip) |
Christian Couder | 737c74e | 2007-10-24 07:01:13 +0200 | [diff] [blame] | 476 | bisect_write "$command" "$rev" ;; |
Matthieu Moy | 21b55e3 | 2015-06-29 17:40:34 +0200 | [diff] [blame] | 477 | terms) |
| 478 | bisect_terms $rev ;; |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 479 | *) |
Ævar Arnfjörð Bjarmason | 9570fc1 | 2011-05-21 18:44:23 +0000 | [diff] [blame] | 480 | die "$(gettext "?? what are you talking about?")" ;; |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 481 | esac |
Ævar Arnfjörð Bjarmason | 55a9fc8 | 2011-05-21 18:44:27 +0000 | [diff] [blame] | 482 | done <"$file" |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 483 | bisect_auto_next |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 484 | } |
| 485 | |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 486 | bisect_run () { |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 487 | bisect_next_check fail |
Christian Couder | 8302012 | 2007-03-27 06:49:57 +0200 | [diff] [blame] | 488 | |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 489 | while true |
| 490 | do |
| 491 | command="$@" |
Jon Seymour | 3145b1a | 2011-08-31 09:09:47 +1000 | [diff] [blame] | 492 | eval_gettextln "running \$command" |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 493 | "$@" |
| 494 | res=$? |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 495 | |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 496 | # Check for really bad run error. |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 497 | if [ $res -lt 0 -o $res -ge 128 ] |
| 498 | then |
Jon Seymour | 3145b1a | 2011-08-31 09:09:47 +1000 | [diff] [blame] | 499 | eval_gettextln "bisect run failed: |
| 500 | exit code \$res from '\$command' is < 0 or >= 128" >&2 |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 501 | exit $res |
| 502 | fi |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 503 | |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 504 | # Find current state depending on run success or failure. |
| 505 | # A special exit code of 125 means cannot test. |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 506 | if [ $res -eq 125 ] |
| 507 | then |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 508 | state='skip' |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 509 | elif [ $res -gt 0 ] |
| 510 | then |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 511 | state="$TERM_BAD" |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 512 | else |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 513 | state="$TERM_GOOD" |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 514 | fi |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 515 | |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 516 | # We have to use a subshell because "bisect_state" can exit. |
Jacopo Notarstefano | 305a233 | 2014-03-04 01:21:43 +0100 | [diff] [blame] | 517 | ( bisect_state $state >"$GIT_DIR/BISECT_RUN" ) |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 518 | res=$? |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 519 | |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 520 | cat "$GIT_DIR/BISECT_RUN" |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 521 | |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 522 | 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] | 523 | >/dev/null |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 524 | then |
Jon Seymour | 3145b1a | 2011-08-31 09:09:47 +1000 | [diff] [blame] | 525 | gettextln "bisect run cannot continue any more" >&2 |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 526 | exit $res |
| 527 | fi |
Christian Couder | 71b0251 | 2007-10-26 05:39:37 +0200 | [diff] [blame] | 528 | |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 529 | if [ $res -ne 0 ] |
| 530 | then |
Jon Seymour | 3145b1a | 2011-08-31 09:09:47 +1000 | [diff] [blame] | 531 | eval_gettextln "bisect run failed: |
| 532 | 'bisect_state \$state' exited with error code \$res" >&2 |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 533 | exit $res |
| 534 | fi |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 535 | |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 536 | 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] | 537 | then |
Jon Seymour | 3145b1a | 2011-08-31 09:09:47 +1000 | [diff] [blame] | 538 | gettextln "bisect run success" |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 539 | exit 0; |
| 540 | fi |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 541 | |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 542 | done |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 543 | } |
| 544 | |
SZEDER Gábor | 412ff73 | 2010-10-10 23:48:56 +0200 | [diff] [blame] | 545 | bisect_log () { |
Ævar Arnfjörð Bjarmason | 9570fc1 | 2011-05-21 18:44:23 +0000 | [diff] [blame] | 546 | test -s "$GIT_DIR/BISECT_LOG" || die "$(gettext "We are not bisecting.")" |
SZEDER Gábor | 412ff73 | 2010-10-10 23:48:56 +0200 | [diff] [blame] | 547 | cat "$GIT_DIR/BISECT_LOG" |
| 548 | } |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 549 | |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 550 | get_terms () { |
| 551 | if test -s "$GIT_DIR/BISECT_TERMS" |
| 552 | then |
| 553 | { |
| 554 | read TERM_BAD |
| 555 | read TERM_GOOD |
| 556 | } <"$GIT_DIR/BISECT_TERMS" |
| 557 | fi |
| 558 | } |
| 559 | |
| 560 | write_terms () { |
| 561 | TERM_BAD=$1 |
| 562 | TERM_GOOD=$2 |
Matthieu Moy | fe67687 | 2015-06-29 17:40:32 +0200 | [diff] [blame] | 563 | if test "$TERM_BAD" = "$TERM_GOOD" |
| 564 | then |
| 565 | die "$(gettext "please use two different terms")" |
| 566 | fi |
| 567 | check_term_format "$TERM_BAD" bad |
| 568 | check_term_format "$TERM_GOOD" good |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 569 | printf '%s\n%s\n' "$TERM_BAD" "$TERM_GOOD" >"$GIT_DIR/BISECT_TERMS" |
| 570 | } |
| 571 | |
Matthieu Moy | fe67687 | 2015-06-29 17:40:32 +0200 | [diff] [blame] | 572 | check_term_format () { |
| 573 | term=$1 |
| 574 | git check-ref-format refs/bisect/"$term" || |
| 575 | die "$(eval_gettext "'\$term' is not a valid term")" |
| 576 | case "$term" in |
| 577 | help|start|terms|skip|next|reset|visualize|replay|log|run) |
| 578 | die "$(eval_gettext "can't use the builtin command '\$term' as a term")" |
| 579 | ;; |
| 580 | bad|new) |
| 581 | if test "$2" != bad |
| 582 | then |
| 583 | # In theory, nothing prevents swapping |
| 584 | # completely good and bad, but this situation |
| 585 | # could be confusing and hasn't been tested |
| 586 | # enough. Forbid it for now. |
| 587 | die "$(eval_gettext "can't change the meaning of term '\$term'")" |
| 588 | fi |
| 589 | ;; |
| 590 | good|old) |
| 591 | if test "$2" != good |
| 592 | then |
| 593 | die "$(eval_gettext "can't change the meaning of term '\$term'")" |
| 594 | fi |
| 595 | ;; |
| 596 | esac |
| 597 | } |
| 598 | |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 599 | check_and_set_terms () { |
| 600 | cmd="$1" |
| 601 | case "$cmd" in |
| 602 | skip|start|terms) ;; |
| 603 | *) |
| 604 | if test -s "$GIT_DIR/BISECT_TERMS" && test "$cmd" != "$TERM_BAD" && test "$cmd" != "$TERM_GOOD" |
| 605 | then |
| 606 | die "$(eval_gettext "Invalid command: you're currently in a \$TERM_BAD/\$TERM_GOOD bisect.")" |
| 607 | fi |
| 608 | case "$cmd" in |
| 609 | bad|good) |
| 610 | if ! test -s "$GIT_DIR/BISECT_TERMS" |
| 611 | then |
| 612 | write_terms bad good |
| 613 | fi |
| 614 | ;; |
Antoine Delaite | 21e5cfd | 2015-06-29 17:40:33 +0200 | [diff] [blame] | 615 | new|old) |
| 616 | if ! test -s "$GIT_DIR/BISECT_TERMS" |
| 617 | then |
| 618 | write_terms new old |
| 619 | fi |
| 620 | ;; |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 621 | esac ;; |
| 622 | esac |
| 623 | } |
| 624 | |
| 625 | bisect_voc () { |
| 626 | case "$1" in |
Antoine Delaite | 21e5cfd | 2015-06-29 17:40:33 +0200 | [diff] [blame] | 627 | bad) echo "bad|new" ;; |
| 628 | good) echo "good|old" ;; |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 629 | esac |
| 630 | } |
| 631 | |
Matthieu Moy | 21b55e3 | 2015-06-29 17:40:34 +0200 | [diff] [blame] | 632 | bisect_terms () { |
| 633 | get_terms |
| 634 | if ! test -s "$GIT_DIR/BISECT_TERMS" |
| 635 | then |
| 636 | die "$(gettext "no terms defined")" |
| 637 | fi |
| 638 | case "$#" in |
| 639 | 0) |
| 640 | gettextln "Your current terms are $TERM_GOOD for the old state |
| 641 | and $TERM_BAD for the new state." |
| 642 | ;; |
| 643 | 1) |
| 644 | arg=$1 |
| 645 | case "$arg" in |
| 646 | --term-good|--term-old) |
| 647 | printf '%s\n' "$TERM_GOOD" |
| 648 | ;; |
| 649 | --term-bad|--term-new) |
| 650 | printf '%s\n' "$TERM_BAD" |
| 651 | ;; |
| 652 | *) |
| 653 | die "$(eval_gettext "invalid argument \$arg for 'git bisect terms'. |
| 654 | Supported options are: --term-good|--term-old and --term-bad|--term-new.")" |
| 655 | ;; |
| 656 | esac |
| 657 | ;; |
| 658 | *) |
| 659 | usage ;; |
| 660 | esac |
| 661 | } |
| 662 | |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 663 | case "$#" in |
| 664 | 0) |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 665 | usage ;; |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 666 | *) |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 667 | cmd="$1" |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 668 | get_terms |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 669 | shift |
| 670 | case "$cmd" in |
| 671 | help) |
| 672 | git bisect -h ;; |
| 673 | start) |
| 674 | bisect_start "$@" ;; |
Antoine Delaite | 21e5cfd | 2015-06-29 17:40:33 +0200 | [diff] [blame] | 675 | bad|good|new|old|"$TERM_BAD"|"$TERM_GOOD") |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 676 | bisect_state "$cmd" "$@" ;; |
| 677 | skip) |
| 678 | bisect_skip "$@" ;; |
| 679 | next) |
| 680 | # Not sure we want "next" at the UI level anymore. |
| 681 | bisect_next "$@" ;; |
| 682 | visualize|view) |
| 683 | bisect_visualize "$@" ;; |
| 684 | reset) |
| 685 | bisect_reset "$@" ;; |
| 686 | replay) |
| 687 | bisect_replay "$@" ;; |
| 688 | log) |
| 689 | bisect_log ;; |
| 690 | run) |
| 691 | bisect_run "$@" ;; |
Matthieu Moy | 21b55e3 | 2015-06-29 17:40:34 +0200 | [diff] [blame] | 692 | terms) |
| 693 | bisect_terms "$@" ;; |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 694 | *) |
| 695 | usage ;; |
| 696 | esac |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 697 | esac |