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