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. |
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. |
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 | |
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 | # |
Pranit Bauva | fb71a32 | 2017-09-29 06:49:39 +0000 | [diff] [blame] | 189 | git bisect--helper --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 | # |
Pranit Bauva | fb71a32 | 2017-09-29 06:49:39 +0000 | [diff] [blame] | 198 | trap 'git bisect--helper --bisect-clean-state' 0 |
Christian Couder | ba963de | 2008-05-23 00:39:22 +0200 | [diff] [blame] | 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 |
Pranit Bauva | ecb3f37 | 2017-09-29 06:49:39 +0000 | [diff] [blame] | 212 | git bisect--helper --write-terms "$TERM_BAD" "$TERM_GOOD" || exit |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 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 | ee2314f | 2008-11-23 22:02:49 +0100 | [diff] [blame] | 240 | bisect_skip() { |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 241 | all='' |
Christian Couder | ee2314f | 2008-11-23 22:02:49 +0100 | [diff] [blame] | 242 | for arg in "$@" |
| 243 | do |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 244 | case "$arg" in |
| 245 | *..*) |
| 246 | revs=$(git rev-list "$arg") || die "$(eval_gettext "Bad rev input: \$arg")" ;; |
| 247 | *) |
| 248 | revs=$(git rev-parse --sq-quote "$arg") ;; |
| 249 | esac |
| 250 | all="$all $revs" |
| 251 | done |
| 252 | eval bisect_state 'skip' $all |
Christian Couder | ee2314f | 2008-11-23 22:02:49 +0100 | [diff] [blame] | 253 | } |
| 254 | |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 255 | bisect_state() { |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 256 | bisect_autostart |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 257 | state=$1 |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 258 | check_and_set_terms $state |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 259 | case "$#,$state" in |
| 260 | 0,*) |
Vasco Almeida | f813fb4 | 2016-06-17 21:54:14 +0000 | [diff] [blame] | 261 | die "Please call 'bisect_state' with at least one argument." ;; |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 262 | 1,"$TERM_BAD"|1,"$TERM_GOOD"|1,skip) |
Vasco Almeida | 57984dd | 2016-06-17 20:21:00 +0000 | [diff] [blame] | 263 | bisected_head=$(bisect_head) |
| 264 | rev=$(git rev-parse --verify "$bisected_head") || |
| 265 | die "$(eval_gettext "Bad rev input: \$bisected_head")" |
Christian Couder | c9c4e2d | 2008-08-22 05:52:29 +0200 | [diff] [blame] | 266 | bisect_write "$state" "$rev" |
Pranit Bauva | b903674 | 2017-09-29 06:49:40 +0000 | [diff] [blame] | 267 | git bisect--helper --check-expected-revs "$rev" ;; |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 268 | 2,"$TERM_BAD"|*,"$TERM_GOOD"|*,skip) |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 269 | shift |
Christian Couder | 6bc02d5 | 2014-12-25 19:25:32 +0100 | [diff] [blame] | 270 | hash_list='' |
Christian Couder | e338907 | 2008-04-12 07:53:59 +0200 | [diff] [blame] | 271 | for rev in "$@" |
Christian Couder | 155fc79 | 2007-10-24 07:01:21 +0200 | [diff] [blame] | 272 | do |
Christian Couder | a179a30 | 2008-04-12 02:17:36 -0700 | [diff] [blame] | 273 | sha=$(git rev-parse --verify "$rev^{commit}") || |
Ævar Arnfjörð Bjarmason | 15eaa04 | 2011-05-21 18:44:24 +0000 | [diff] [blame] | 274 | die "$(eval_gettext "Bad rev input: \$rev")" |
Christian Couder | 6bc02d5 | 2014-12-25 19:25:32 +0100 | [diff] [blame] | 275 | hash_list="$hash_list $sha" |
Christian Couder | d3e54c8 | 2008-04-14 05:41:45 +0200 | [diff] [blame] | 276 | done |
Christian Couder | 6bc02d5 | 2014-12-25 19:25:32 +0100 | [diff] [blame] | 277 | for rev in $hash_list |
| 278 | do |
| 279 | bisect_write "$state" "$rev" |
| 280 | done |
Pranit Bauva | b903674 | 2017-09-29 06:49:40 +0000 | [diff] [blame] | 281 | git bisect--helper --check-expected-revs $hash_list ;; |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 282 | *,"$TERM_BAD") |
| 283 | 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] | 284 | *) |
| 285 | usage ;; |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 286 | esac |
Christian Couder | 97e1c51 | 2007-10-22 07:48:36 +0200 | [diff] [blame] | 287 | bisect_auto_next |
| 288 | } |
| 289 | |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 290 | bisect_next_check() { |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 291 | missing_good= missing_bad= |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 292 | git show-ref -q --verify refs/bisect/$TERM_BAD || missing_bad=t |
| 293 | 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] | 294 | |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 295 | case "$missing_good,$missing_bad,$1" in |
| 296 | ,,*) |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 297 | : have both $TERM_GOOD and $TERM_BAD - ok |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 298 | ;; |
| 299 | *,) |
| 300 | # do not have both but not asked to fail - just report. |
| 301 | false |
| 302 | ;; |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 303 | t,,"$TERM_GOOD") |
Antoine Delaite | 21e5cfd | 2015-06-29 17:40:33 +0200 | [diff] [blame] | 304 | # 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] | 305 | # this is less optimum. |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 306 | eval_gettextln "Warning: bisecting only with a \$TERM_BAD commit." >&2 |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 307 | if test -t 0 |
| 308 | then |
Ævar Arnfjörð Bjarmason | 04de099 | 2011-05-21 18:44:28 +0000 | [diff] [blame] | 309 | # TRANSLATORS: Make sure to include [Y] and [n] in your |
| 310 | # translation. The program will only accept English input |
| 311 | # at this point. |
| 312 | gettext "Are you sure [Y/n]? " >&2 |
Francis Moreau | e5d3afd | 2008-08-11 19:37:46 +0200 | [diff] [blame] | 313 | read yesno |
| 314 | case "$yesno" in [Nn]*) exit 1 ;; esac |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 315 | fi |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 316 | : bisect without $TERM_GOOD... |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 317 | ;; |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 318 | *) |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 319 | bad_syn=$(bisect_voc bad) |
| 320 | good_syn=$(bisect_voc good) |
Ævar Arnfjörð Bjarmason | be508d3 | 2011-05-21 18:44:29 +0000 | [diff] [blame] | 321 | if test -s "$GIT_DIR/BISECT_START" |
| 322 | then |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 323 | |
| 324 | eval_gettextln "You need to give me at least one \$bad_syn and one \$good_syn revision. |
| 325 | (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] | 326 | else |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 327 | eval_gettextln "You need to start by \"git bisect start\". |
| 328 | You then need to give me at least one \$good_syn and one \$bad_syn revision. |
| 329 | (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] | 330 | fi |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 331 | exit 1 ;; |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 332 | esac |
| 333 | } |
| 334 | |
| 335 | bisect_auto_next() { |
Junio C Hamano | 434d036 | 2005-09-17 13:51:03 -0700 | [diff] [blame] | 336 | bisect_next_check && bisect_next || : |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 337 | } |
| 338 | |
| 339 | bisect_next() { |
Christian Couder | 8fe26f4 | 2007-10-22 07:48:23 +0200 | [diff] [blame] | 340 | case "$#" in 0) ;; *) usage ;; esac |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 341 | bisect_autostart |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 342 | bisect_next_check $TERM_GOOD |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 343 | |
Christian Couder | 0871984 | 2009-05-09 17:55:47 +0200 | [diff] [blame] | 344 | # Perform all bisection computation, display and checkout |
Jon Seymour | 4796e82 | 2011-08-04 22:01:01 +1000 | [diff] [blame] | 345 | 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] | 346 | res=$? |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 347 | |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 348 | # Check if we should exit because bisection is finished |
Torstein Hegge | a7f8b8a | 2013-04-13 17:22:57 +0200 | [diff] [blame] | 349 | if test $res -eq 10 |
| 350 | then |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 351 | bad_rev=$(git show-ref --hash --verify refs/bisect/$TERM_BAD) |
Torstein Hegge | a7f8b8a | 2013-04-13 17:22:57 +0200 | [diff] [blame] | 352 | bad_commit=$(git show-branch $bad_rev) |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 353 | echo "# first $TERM_BAD commit: $bad_commit" >>"$GIT_DIR/BISECT_LOG" |
Torstein Hegge | a7f8b8a | 2013-04-13 17:22:57 +0200 | [diff] [blame] | 354 | exit 0 |
Torstein Hegge | f989cac | 2013-04-22 23:02:29 +0200 | [diff] [blame] | 355 | elif test $res -eq 2 |
| 356 | then |
| 357 | echo "# only skipped commits left to test" >>"$GIT_DIR/BISECT_LOG" |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 358 | good_revs=$(git for-each-ref --format="%(objectname)" "refs/bisect/$TERM_GOOD-*") |
| 359 | 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] | 360 | do |
| 361 | skipped_commit=$(git show-branch $skipped) |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 362 | echo "# possible first $TERM_BAD commit: $skipped_commit" >>"$GIT_DIR/BISECT_LOG" |
Torstein Hegge | f989cac | 2013-04-22 23:02:29 +0200 | [diff] [blame] | 363 | done |
| 364 | exit $res |
Torstein Hegge | a7f8b8a | 2013-04-13 17:22:57 +0200 | [diff] [blame] | 365 | fi |
Junio C Hamano | 0a5280a | 2007-04-05 23:27:44 -0700 | [diff] [blame] | 366 | |
Christian Couder | 5a1d31c | 2009-04-19 11:56:16 +0200 | [diff] [blame] | 367 | # Check for an error in the bisection process |
| 368 | test $res -ne 0 && exit $res |
| 369 | |
| 370 | return 0 |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 371 | } |
| 372 | |
Junio C Hamano | cc9f24d | 2005-08-30 12:45:41 -0700 | [diff] [blame] | 373 | bisect_visualize() { |
| 374 | bisect_next_check fail |
Junio C Hamano | 235997c | 2007-12-07 02:25:34 -0800 | [diff] [blame] | 375 | |
| 376 | if test $# = 0 |
| 377 | then |
Jeff King | c4e4644e | 2011-03-21 09:14:22 -0400 | [diff] [blame] | 378 | if test -n "${DISPLAY+set}${SESSIONNAME+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" && |
Junio C Hamano | 43b8ff4 | 2011-08-05 10:09:23 -0700 | [diff] [blame] | 379 | type gitk >/dev/null 2>&1 |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 380 | then |
Jeff King | c4e4644e | 2011-03-21 09:14:22 -0400 | [diff] [blame] | 381 | set gitk |
| 382 | else |
| 383 | set git log |
| 384 | fi |
Junio C Hamano | 235997c | 2007-12-07 02:25:34 -0800 | [diff] [blame] | 385 | else |
| 386 | case "$1" in |
| 387 | git*|tig) ;; |
| 388 | -*) set git log "$@" ;; |
| 389 | *) set git "$@" ;; |
| 390 | esac |
| 391 | fi |
| 392 | |
Christian Couder | fc13aa3 | 2009-11-23 05:16:14 +0100 | [diff] [blame] | 393 | eval '"$@"' --bisect -- $(cat "$GIT_DIR/BISECT_NAMES") |
Junio C Hamano | cc9f24d | 2005-08-30 12:45:41 -0700 | [diff] [blame] | 394 | } |
| 395 | |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 396 | bisect_reset() { |
Christian Couder | 823ea12 | 2008-05-28 18:57:02 +0200 | [diff] [blame] | 397 | test -s "$GIT_DIR/BISECT_START" || { |
Jon Seymour | 3145b1a | 2011-08-31 09:09:47 +1000 | [diff] [blame] | 398 | gettextln "We are not bisecting." |
Christian Couder | fce0499 | 2007-11-20 06:39:53 +0100 | [diff] [blame] | 399 | return |
| 400 | } |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 401 | case "$#" in |
Christian Couder | 823ea12 | 2008-05-28 18:57:02 +0200 | [diff] [blame] | 402 | 0) branch=$(cat "$GIT_DIR/BISECT_START") ;; |
Jacopo Notarstefano | 305a233 | 2014-03-04 01:21:43 +0100 | [diff] [blame] | 403 | 1) git rev-parse --quiet --verify "$1^{commit}" >/dev/null || { |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 404 | invalid="$1" |
| 405 | die "$(eval_gettext "'\$invalid' is not a valid commit")" |
| 406 | } |
| 407 | branch="$1" ;; |
Christian Couder | 8fe26f4 | 2007-10-22 07:48:23 +0200 | [diff] [blame] | 408 | *) |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 409 | usage ;; |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 410 | esac |
Junio C Hamano | 43b8ff4 | 2011-08-05 10:09:23 -0700 | [diff] [blame] | 411 | |
| 412 | if ! test -f "$GIT_DIR/BISECT_HEAD" && ! git checkout "$branch" -- |
Jon Seymour | 4796e82 | 2011-08-04 22:01:01 +1000 | [diff] [blame] | 413 | then |
Junio C Hamano | 43b8ff4 | 2011-08-05 10:09:23 -0700 | [diff] [blame] | 414 | die "$(eval_gettext "Could not check out original HEAD '\$branch'. |
Ævar Arnfjörð Bjarmason | 15eaa04 | 2011-05-21 18:44:24 +0000 | [diff] [blame] | 415 | Try 'git bisect reset <commit>'.")" |
SZEDER Gábor | 3bb8cf8 | 2010-10-10 23:48:57 +0200 | [diff] [blame] | 416 | fi |
Pranit Bauva | fb71a32 | 2017-09-29 06:49:39 +0000 | [diff] [blame] | 417 | git bisect--helper --bisect-clean-state || exit |
Christian Couder | 38a47fd | 2007-04-04 07:12:02 +0200 | [diff] [blame] | 418 | } |
| 419 | |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 420 | bisect_replay () { |
Ævar Arnfjörð Bjarmason | 55a9fc8 | 2011-05-21 18:44:27 +0000 | [diff] [blame] | 421 | file="$1" |
| 422 | test "$#" -eq 1 || die "$(gettext "No logfile given")" |
| 423 | test -r "$file" || die "$(eval_gettext "cannot read \$file for replaying")" |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 424 | bisect_reset |
Miklos Vajna | 6c98c05 | 2008-07-11 18:01:29 +0200 | [diff] [blame] | 425 | while read git bisect command rev |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 426 | do |
Elia Pinto | c82af12 | 2014-06-06 07:55:50 -0700 | [diff] [blame] | 427 | test "$git $bisect" = "git bisect" || test "$git" = "git-bisect" || continue |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 428 | if test "$git" = "git-bisect" |
| 429 | then |
Miklos Vajna | 6c98c05 | 2008-07-11 18:01:29 +0200 | [diff] [blame] | 430 | rev="$command" |
| 431 | command="$bisect" |
| 432 | fi |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 433 | get_terms |
| 434 | check_and_set_terms "$command" |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 435 | case "$command" in |
| 436 | start) |
Junio C Hamano | e9a45d7 | 2005-11-27 17:42:05 -0800 | [diff] [blame] | 437 | cmd="bisect_start $rev" |
Christian Couder | 737c74e | 2007-10-24 07:01:13 +0200 | [diff] [blame] | 438 | eval "$cmd" ;; |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 439 | "$TERM_GOOD"|"$TERM_BAD"|skip) |
Christian Couder | 737c74e | 2007-10-24 07:01:13 +0200 | [diff] [blame] | 440 | bisect_write "$command" "$rev" ;; |
Matthieu Moy | 21b55e3 | 2015-06-29 17:40:34 +0200 | [diff] [blame] | 441 | terms) |
| 442 | bisect_terms $rev ;; |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 443 | *) |
Ævar Arnfjörð Bjarmason | 9570fc1 | 2011-05-21 18:44:23 +0000 | [diff] [blame] | 444 | die "$(gettext "?? what are you talking about?")" ;; |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 445 | esac |
Ævar Arnfjörð Bjarmason | 55a9fc8 | 2011-05-21 18:44:27 +0000 | [diff] [blame] | 446 | done <"$file" |
Junio C Hamano | e204de2 | 2005-09-10 15:18:31 -0700 | [diff] [blame] | 447 | bisect_auto_next |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 448 | } |
| 449 | |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 450 | bisect_run () { |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 451 | bisect_next_check fail |
Christian Couder | 8302012 | 2007-03-27 06:49:57 +0200 | [diff] [blame] | 452 | |
Stephan Beyer | fecd2dd | 2017-11-12 21:55:33 +0100 | [diff] [blame] | 453 | test -n "$*" || die "$(gettext "bisect run failed: no command provided.")" |
| 454 | |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 455 | while true |
| 456 | do |
| 457 | command="$@" |
Jon Seymour | 3145b1a | 2011-08-31 09:09:47 +1000 | [diff] [blame] | 458 | eval_gettextln "running \$command" |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 459 | "$@" |
| 460 | res=$? |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 461 | |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 462 | # Check for really bad run error. |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 463 | if [ $res -lt 0 -o $res -ge 128 ] |
| 464 | then |
Jon Seymour | 3145b1a | 2011-08-31 09:09:47 +1000 | [diff] [blame] | 465 | eval_gettextln "bisect run failed: |
| 466 | exit code \$res from '\$command' is < 0 or >= 128" >&2 |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 467 | exit $res |
| 468 | fi |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 469 | |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 470 | # Find current state depending on run success or failure. |
| 471 | # A special exit code of 125 means cannot test. |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 472 | if [ $res -eq 125 ] |
| 473 | then |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 474 | state='skip' |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 475 | elif [ $res -gt 0 ] |
| 476 | then |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 477 | state="$TERM_BAD" |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 478 | else |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 479 | state="$TERM_GOOD" |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 480 | fi |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 481 | |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 482 | # We have to use a subshell because "bisect_state" can exit. |
Jacopo Notarstefano | 305a233 | 2014-03-04 01:21:43 +0100 | [diff] [blame] | 483 | ( bisect_state $state >"$GIT_DIR/BISECT_RUN" ) |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 484 | res=$? |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 485 | |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 486 | cat "$GIT_DIR/BISECT_RUN" |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 487 | |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 488 | 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] | 489 | >/dev/null |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 490 | then |
Jon Seymour | 3145b1a | 2011-08-31 09:09:47 +1000 | [diff] [blame] | 491 | gettextln "bisect run cannot continue any more" >&2 |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 492 | exit $res |
| 493 | fi |
Christian Couder | 71b0251 | 2007-10-26 05:39:37 +0200 | [diff] [blame] | 494 | |
Jon Seymour | eef12a9 | 2011-08-05 21:31:31 +1000 | [diff] [blame] | 495 | if [ $res -ne 0 ] |
| 496 | then |
Jon Seymour | 3145b1a | 2011-08-31 09:09:47 +1000 | [diff] [blame] | 497 | eval_gettextln "bisect run failed: |
| 498 | 'bisect_state \$state' exited with error code \$res" >&2 |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 499 | exit $res |
| 500 | fi |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 501 | |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 502 | 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] | 503 | then |
Jon Seymour | 3145b1a | 2011-08-31 09:09:47 +1000 | [diff] [blame] | 504 | gettextln "bisect run success" |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 505 | exit 0; |
| 506 | fi |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 507 | |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 508 | done |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 509 | } |
| 510 | |
SZEDER Gábor | 412ff73 | 2010-10-10 23:48:56 +0200 | [diff] [blame] | 511 | bisect_log () { |
Ævar Arnfjörð Bjarmason | 9570fc1 | 2011-05-21 18:44:23 +0000 | [diff] [blame] | 512 | 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] | 513 | cat "$GIT_DIR/BISECT_LOG" |
| 514 | } |
Christian Couder | a17c410 | 2007-03-23 08:49:59 +0100 | [diff] [blame] | 515 | |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 516 | get_terms () { |
| 517 | if test -s "$GIT_DIR/BISECT_TERMS" |
| 518 | then |
| 519 | { |
| 520 | read TERM_BAD |
| 521 | read TERM_GOOD |
| 522 | } <"$GIT_DIR/BISECT_TERMS" |
| 523 | fi |
| 524 | } |
| 525 | |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 526 | check_and_set_terms () { |
| 527 | cmd="$1" |
| 528 | case "$cmd" in |
| 529 | skip|start|terms) ;; |
| 530 | *) |
| 531 | if test -s "$GIT_DIR/BISECT_TERMS" && test "$cmd" != "$TERM_BAD" && test "$cmd" != "$TERM_GOOD" |
| 532 | then |
| 533 | die "$(eval_gettext "Invalid command: you're currently in a \$TERM_BAD/\$TERM_GOOD bisect.")" |
| 534 | fi |
| 535 | case "$cmd" in |
| 536 | bad|good) |
| 537 | if ! test -s "$GIT_DIR/BISECT_TERMS" |
| 538 | then |
Pranit Bauva | ecb3f37 | 2017-09-29 06:49:39 +0000 | [diff] [blame] | 539 | TERM_BAD=bad |
| 540 | TERM_GOOD=good |
| 541 | git bisect--helper --write-terms "$TERM_BAD" "$TERM_GOOD" || exit |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 542 | fi |
| 543 | ;; |
Antoine Delaite | 21e5cfd | 2015-06-29 17:40:33 +0200 | [diff] [blame] | 544 | new|old) |
| 545 | if ! test -s "$GIT_DIR/BISECT_TERMS" |
| 546 | then |
Pranit Bauva | ecb3f37 | 2017-09-29 06:49:39 +0000 | [diff] [blame] | 547 | TERM_BAD=new |
| 548 | TERM_GOOD=old |
| 549 | git bisect--helper --write-terms "$TERM_BAD" "$TERM_GOOD" || exit |
Antoine Delaite | 21e5cfd | 2015-06-29 17:40:33 +0200 | [diff] [blame] | 550 | fi |
| 551 | ;; |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 552 | esac ;; |
| 553 | esac |
| 554 | } |
| 555 | |
| 556 | bisect_voc () { |
| 557 | case "$1" in |
Antoine Delaite | 21e5cfd | 2015-06-29 17:40:33 +0200 | [diff] [blame] | 558 | bad) echo "bad|new" ;; |
| 559 | good) echo "good|old" ;; |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 560 | esac |
| 561 | } |
| 562 | |
Matthieu Moy | 21b55e3 | 2015-06-29 17:40:34 +0200 | [diff] [blame] | 563 | bisect_terms () { |
| 564 | get_terms |
| 565 | if ! test -s "$GIT_DIR/BISECT_TERMS" |
| 566 | then |
| 567 | die "$(gettext "no terms defined")" |
| 568 | fi |
| 569 | case "$#" in |
| 570 | 0) |
| 571 | gettextln "Your current terms are $TERM_GOOD for the old state |
| 572 | and $TERM_BAD for the new state." |
| 573 | ;; |
| 574 | 1) |
| 575 | arg=$1 |
| 576 | case "$arg" in |
| 577 | --term-good|--term-old) |
| 578 | printf '%s\n' "$TERM_GOOD" |
| 579 | ;; |
| 580 | --term-bad|--term-new) |
| 581 | printf '%s\n' "$TERM_BAD" |
| 582 | ;; |
| 583 | *) |
| 584 | die "$(eval_gettext "invalid argument \$arg for 'git bisect terms'. |
| 585 | Supported options are: --term-good|--term-old and --term-bad|--term-new.")" |
| 586 | ;; |
| 587 | esac |
| 588 | ;; |
| 589 | *) |
| 590 | usage ;; |
| 591 | esac |
| 592 | } |
| 593 | |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 594 | case "$#" in |
| 595 | 0) |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 596 | usage ;; |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 597 | *) |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 598 | cmd="$1" |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 599 | get_terms |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 600 | shift |
| 601 | case "$cmd" in |
| 602 | help) |
| 603 | git bisect -h ;; |
| 604 | start) |
| 605 | bisect_start "$@" ;; |
Antoine Delaite | 21e5cfd | 2015-06-29 17:40:33 +0200 | [diff] [blame] | 606 | bad|good|new|old|"$TERM_BAD"|"$TERM_GOOD") |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 607 | bisect_state "$cmd" "$@" ;; |
| 608 | skip) |
| 609 | bisect_skip "$@" ;; |
| 610 | next) |
| 611 | # Not sure we want "next" at the UI level anymore. |
| 612 | bisect_next "$@" ;; |
| 613 | visualize|view) |
| 614 | bisect_visualize "$@" ;; |
| 615 | reset) |
| 616 | bisect_reset "$@" ;; |
| 617 | replay) |
| 618 | bisect_replay "$@" ;; |
| 619 | log) |
| 620 | bisect_log ;; |
| 621 | run) |
| 622 | bisect_run "$@" ;; |
Matthieu Moy | 21b55e3 | 2015-06-29 17:40:34 +0200 | [diff] [blame] | 623 | terms) |
| 624 | bisect_terms "$@" ;; |
Jon Seymour | 6021be8 | 2011-08-05 21:31:30 +1000 | [diff] [blame] | 625 | *) |
| 626 | usage ;; |
| 627 | esac |
Linus Torvalds | 8cc6a08 | 2005-07-30 10:08:20 -0700 | [diff] [blame] | 628 | esac |