3 USAGE
='[start|bad|good|next|reset|visualize|replay|log|run]'
4 LONG_USAGE
='git bisect start [<bad> [<good>...]] [--] [<pathspec>...]
5 reset bisect state and start bisection.
7 mark <rev> a known-bad revision.
8 git bisect good [<rev>...]
9 mark <rev>... known-good revisions.
11 find next bisection to test and check it out.
12 git bisect reset [<branch>]
13 finish bisection search and go back to branch.
15 show bisect status in gitk.
16 git bisect replay <logfile>
20 git bisect run <cmd>...
21 use <cmd>... to automatically bisect.'
29 s/'\''/'\'\\\\\'\''/g;
37 test -d "$GIT_DIR/refs/bisect" ||
{
38 echo >&2 'You need to start by "git bisect start"'
41 echo >&2 -n 'Do you want me to do it for you [Y/n]? '
56 # Verify HEAD. If we were bisecting before this, reset to the
57 # top-of-line master first!
59 head=$
(GIT_DIR
="$GIT_DIR" git symbolic-ref HEAD
) ||
60 die
"Bad HEAD - I need a symbolic ref"
63 if [ -s "$GIT_DIR/head-name" ]; then
64 branch
=`cat "$GIT_DIR/head-name"`
68 git checkout
$branch ||
exit
71 [ -s "$GIT_DIR/head-name" ] && die
"won't bisect on seeked tree"
72 echo "$head" |
sed 's#^refs/heads/##' >"$GIT_DIR/head-name"
75 die
"Bad HEAD - strange symbolic ref"
80 # Get rid of any old bisect state
83 mkdir
"$GIT_DIR/refs/bisect"
86 # Check for one bad and then some good revisions.
90 case "$arg" in --) has_double_dash
=1; break ;; esac
94 while [ $# -gt 0 ]; do
102 rev=$
(git rev-parse
--verify "$arg^{commit}" 2>/dev
/null
) ||
{
103 test $has_double_dash -eq 1 &&
104 die
"'$arg' does not appear to be a valid revision"
107 if [ $bad_seen -eq 0 ]; then
109 bisect_write_bad
"$rev"
111 bisect_write_good
"$rev"
118 sq "$@" >"$GIT_DIR/BISECT_NAMES"
119 echo "git-bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG"
127 rev=$
(git rev-parse
--verify HEAD
) ;;
129 rev=$
(git rev-parse
--verify "$1^{commit}") ;;
133 bisect_write_bad
"$rev"
134 echo "git-bisect bad $rev" >>"$GIT_DIR/BISECT_LOG"
140 echo "$rev" >"$GIT_DIR/refs/bisect/bad"
141 echo "# bad: "$
(git show-branch
$rev) >>"$GIT_DIR/BISECT_LOG"
147 0) revs
=$
(git rev-parse
--verify HEAD
) ||
exit ;;
148 *) revs
=$
(git rev-parse
--revs-only --no-flags "$@") &&
149 test '' != "$revs" || die
"Bad rev input: $@" ;;
153 rev=$
(git rev-parse
--verify "$rev^{commit}") ||
exit
154 bisect_write_good
"$rev"
155 echo "git-bisect good $rev" >>"$GIT_DIR/BISECT_LOG"
161 bisect_write_good
() {
163 echo "$rev" >"$GIT_DIR/refs/bisect/good-$rev"
164 echo "# good: "$
(git show-branch
$rev) >>"$GIT_DIR/BISECT_LOG"
167 bisect_next_check
() {
168 missing_good
= missing_bad
=
169 git show-ref
-q --verify refs
/bisect
/bad || missing_bad
=t
170 test -n "$(git for-each-ref "refs
/bisect
/good-
*")" || missing_good
=t
172 case "$missing_good,$missing_bad,$1" in
174 : have both good and bad
- ok
177 # do not have both but not asked to fail - just report.
181 # have bad but not good. we could bisect although
182 # this is less optimum.
183 echo >&2 'Warning: bisecting only with a bad commit.'
186 printf >&2 'Are you sure [Y/n]? '
187 case "$(read yesno)" in [Nn
]*) exit 1 ;; esac
189 : bisect without good...
193 test -d "$GIT_DIR/refs/bisect" ||
{
194 echo >&2 'You need to start by "git bisect start".'
197 echo >&2 'You '$THEN'need to give me at least one good' \
198 'and one bad revisions.'
199 echo >&2 '(You can use "git bisect bad" and' \
200 '"git bisect good" for that.)'
206 bisect_next_check
&& bisect_next ||
:
210 case "$#" in 0) ;; *) usage
;; esac
212 bisect_next_check good
214 bad
=$
(git rev-parse
--verify refs
/bisect
/bad
) &&
215 good
=$
(git for-each-ref
--format='^%(objectname)' \
216 "refs/bisect/good-*" |
tr '[\012]' ' ') &&
217 eval="git rev-list --bisect-vars $good $bad --" &&
218 eval="$eval $(cat "$GIT_DIR/BISECT_NAMES
")" &&
219 eval=$
(eval "$eval") &&
222 if [ -z "$bisect_rev" ]; then
223 echo "$bad was both good and bad"
226 if [ "$bisect_rev" = "$bad" ]; then
227 echo "$bisect_rev is first bad commit"
228 git diff-tree
--pretty $bisect_rev
232 echo "Bisecting: $bisect_nr revisions left to test after this"
233 echo "$bisect_rev" >"$GIT_DIR/refs/heads/new-bisect"
234 git checkout
-q new-bisect ||
exit
235 mv "$GIT_DIR/refs/heads/new-bisect" "$GIT_DIR/refs/heads/bisect" &&
236 GIT_DIR
="$GIT_DIR" git symbolic-ref HEAD refs
/heads
/bisect
237 git show-branch
"$bisect_rev"
241 bisect_next_check fail
242 not
=`cd "$GIT_DIR/refs" && echo bisect/good-*`
243 eval gitk bisect
/bad
--not $not -- $
(cat "$GIT_DIR/BISECT_NAMES")
248 0) if [ -s "$GIT_DIR/head-name" ]; then
249 branch
=`cat "$GIT_DIR/head-name"`
253 1) git show-ref
--verify --quiet -- "refs/heads/$1" ||
{
254 echo >&2 "$1 does not seem to be a valid branch"
261 if git checkout
"$branch"; then
262 rm -f "$GIT_DIR/head-name"
267 bisect_clean_state
() {
268 rm -fr "$GIT_DIR/refs/bisect"
269 rm -f "$GIT_DIR/refs/heads/bisect"
270 rm -f "$GIT_DIR/BISECT_LOG"
271 rm -f "$GIT_DIR/BISECT_NAMES"
272 rm -f "$GIT_DIR/BISECT_RUN"
277 echo >&2 "cannot read $1 for replaying"
281 while read bisect
command rev
283 test "$bisect" = "git-bisect" ||
continue
286 cmd
="bisect_start $rev"
290 echo "$rev" >"$GIT_DIR/refs/bisect/good-$rev"
291 echo "# good: "$
(git show-branch
$rev) >>"$GIT_DIR/BISECT_LOG"
292 echo "git-bisect good $rev" >>"$GIT_DIR/BISECT_LOG"
295 echo "$rev" >"$GIT_DIR/refs/bisect/bad"
296 echo "# bad: "$
(git show-branch
$rev) >>"$GIT_DIR/BISECT_LOG"
297 echo "git-bisect bad $rev" >>"$GIT_DIR/BISECT_LOG"
300 echo >&2 "?? what are you talking about?"
308 bisect_next_check fail
316 # Check for really bad run error.
317 if [ $res -lt 0 -o $res -ge 128 ]; then
318 echo >&2 "bisect run failed:"
319 echo >&2 "exit code $res from '$@' is < 0 or >= 128"
323 # Use "bisect_good" or "bisect_bad"
324 # depending on run success or failure.
325 if [ $res -gt 0 ]; then
326 next_bisect
='bisect_bad'
328 next_bisect
='bisect_good'
331 # We have to use a subshell because bisect_good or
332 # bisect_bad functions can exit.
333 ( $next_bisect > "$GIT_DIR/BISECT_RUN" )
336 cat "$GIT_DIR/BISECT_RUN"
338 if [ $res -ne 0 ]; then
339 echo >&2 "bisect run failed:"
340 echo >&2 "$next_bisect exited with error code $res"
344 if grep "is first bad commit" "$GIT_DIR/BISECT_RUN" > /dev
/null
; then
345 echo "bisect run success"
367 # Not sure we want "next" at the UI level anymore.
370 bisect_visualize
"$@" ;;
374 bisect_replay
"$@" ;;
376 cat "$GIT_DIR/BISECT_LOG" ;;