3 USAGE
='[start|bad|good|skip|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.
10 git bisect skip [<rev>...]
11 mark <rev>... untestable revisions.
13 find next bisection to test and check it out.
14 git bisect reset [<branch>]
15 finish bisection search and go back to branch.
17 show bisect status in gitk.
18 git bisect replay <logfile>
22 git bisect run <cmd>...
23 use <cmd>... to automatically bisect.'
32 s/'\''/'\'\\\\\'\''/g;
40 test -f "$GIT_DIR/BISECT_NAMES" ||
{
41 echo >&2 'You need to start by "git bisect start"'
44 echo >&2 -n 'Do you want me to do it for you [Y/n]? '
59 # Verify HEAD. If we were bisecting before this, reset to the
60 # top-of-line master first!
62 head=$
(GIT_DIR
="$GIT_DIR" git symbolic-ref HEAD
) ||
63 die
"Bad HEAD - I need a symbolic ref"
66 if [ -s "$GIT_DIR/head-name" ]; then
67 branch
=`cat "$GIT_DIR/head-name"`
71 git checkout
$branch ||
exit
74 [ -s "$GIT_DIR/head-name" ] && die
"won't bisect on seeked tree"
75 echo "${head#refs/heads/}" >"$GIT_DIR/head-name"
78 die
"Bad HEAD - strange symbolic ref"
83 # Get rid of any old bisect state
88 # Check for one bad and then some good revisions.
92 case "$arg" in --) has_double_dash
=1; break ;; esac
96 while [ $# -gt 0 ]; do
104 rev=$
(git rev-parse
--verify "$arg^{commit}" 2>/dev
/null
) ||
{
105 test $has_double_dash -eq 1 &&
106 die
"'$arg' does not appear to be a valid revision"
110 0) state
='bad' ; bad_seen
=1 ;;
113 bisect_write
"$state" "$rev" 'nolog'
119 sq "$@" >"$GIT_DIR/BISECT_NAMES"
120 echo "git-bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG"
130 good|skip
) tag
="$state"-"$rev" ;;
131 *) die
"Bad bisect_write argument: $state" ;;
133 git update-ref
"refs/bisect/$tag" "$rev"
134 echo "# $state: "$
(git show-branch
$rev) >>"$GIT_DIR/BISECT_LOG"
135 test -z "$nolog" && echo "git-bisect $state $rev" >>"$GIT_DIR/BISECT_LOG"
143 die
"Please call 'bisect_state' with at least one argument." ;;
145 rev=$
(git rev-parse
--verify HEAD
) ||
146 die
"Bad rev input: HEAD"
147 bisect_write
"$state" "$rev" ;;
149 rev=$
(git rev-parse
--verify "$2^{commit}") ||
150 die
"Bad rev input: $2"
151 bisect_write
"$state" "$rev" ;;
154 revs
=$
(git rev-parse
--revs-only --no-flags "$@") &&
155 test '' != "$revs" || die
"Bad rev input: $@"
158 rev=$
(git rev-parse
--verify "$rev^{commit}") ||
159 die
"Bad rev commit: $rev^{commit}"
160 bisect_write
"$state" "$rev"
168 bisect_next_check
() {
169 missing_good
= missing_bad
=
170 git show-ref
-q --verify refs
/bisect
/bad || missing_bad
=t
171 test -n "$(git for-each-ref "refs
/bisect
/good-
*")" || missing_good
=t
173 case "$missing_good,$missing_bad,$1" in
175 : have both good and bad
- ok
178 # do not have both but not asked to fail - just report.
182 # have bad but not good. we could bisect although
183 # this is less optimum.
184 echo >&2 'Warning: bisecting only with a bad commit.'
187 printf >&2 'Are you sure [Y/n]? '
188 case "$(read yesno)" in [Nn
]*) exit 1 ;; esac
190 : bisect without good...
194 test -f "$GIT_DIR/BISECT_NAMES" ||
{
195 echo >&2 'You need to start by "git bisect start".'
198 echo >&2 'You '$THEN'need to give me at least one good' \
199 'and one bad revisions.'
200 echo >&2 '(You can use "git bisect bad" and' \
201 '"git bisect good" for that.)'
207 bisect_next_check
&& bisect_next ||
:
214 if [ -z "$_skip" ]; then
219 # Let's parse the output of:
220 # "git rev-list --bisect-vars --bisect-all ..."
221 eval $_eval |
while read hash line
223 case "$VARS,$FOUND,$TRIED,$hash" in
224 # We display some vars.
225 1,*,*,*) echo "$hash $line" ;;
230 # We had nothing to search.
236 # We did not find a good bisect rev.
237 # This should happen only if the "bad"
238 # commit is also a "skip" commit.
240 echo "bisect_rev=$TRIED"
246 TRIED
="${TRIED:+$TRIED|}$hash"
250 echo "bisect_rev=$hash"
251 echo "bisect_tried=\"$TRIED\""
257 # We have already found a rev to be tested.
258 ,1,*,bisect_rev
*) VARS
=1 ;;
262 *) die
"filter_skipped error " \
273 exit_if_skipped_commits
() {
275 if expr "$_tried" : ".*[|].*" > /dev
/null
; then
276 echo "There are only 'skip'ped commit left to test."
277 echo "The first bad commit could be any of:"
278 echo "$_tried" |
tr '[|]' '[\012]'
279 echo "We cannot bisect more!"
285 case "$#" in 0) ;; *) usage
;; esac
287 bisect_next_check good
289 skip
=$
(git for-each-ref
--format='%(objectname)' \
290 "refs/bisect/skip-*" |
tr '[\012]' ' ') ||
exit
293 test -n "$skip" && BISECT_OPT
='--bisect-all'
295 bad
=$
(git rev-parse
--verify refs
/bisect
/bad
) &&
296 good
=$
(git for-each-ref
--format='^%(objectname)' \
297 "refs/bisect/good-*" |
tr '[\012]' ' ') &&
298 eval="git rev-list --bisect-vars $BISECT_OPT $good $bad --" &&
299 eval="$eval $(cat "$GIT_DIR/BISECT_NAMES
")" &&
300 eval=$
(filter_skipped
"$eval" "$skip") &&
303 if [ -z "$bisect_rev" ]; then
304 echo "$bad was both good and bad"
307 if [ "$bisect_rev" = "$bad" ]; then
308 exit_if_skipped_commits
"$bisect_tried"
309 echo "$bisect_rev is first bad commit"
310 git diff-tree
--pretty $bisect_rev
314 # We should exit here only if the "bad"
315 # commit is also a "skip" commit (see above).
316 exit_if_skipped_commits
"$bisect_rev"
318 echo "Bisecting: $bisect_nr revisions left to test after this"
319 git branch
-f new-bisect
"$bisect_rev"
320 git checkout
-q new-bisect ||
exit
321 git branch
-M new-bisect bisect
322 git show-branch
"$bisect_rev"
326 bisect_next_check fail
330 case "${DISPLAY+set}" in
337 -*) set git log
"$@" ;;
342 not
=$
(git for-each-ref
--format='%(refname)' "refs/bisect/good-*")
343 eval '"$@"' refs
/bisect
/bad
--not $not -- $
(cat "$GIT_DIR/BISECT_NAMES")
347 test -f "$GIT_DIR/BISECT_NAMES" ||
{
348 echo "We are not bisecting."
352 0) if [ -s "$GIT_DIR/head-name" ]; then
353 branch
=`cat "$GIT_DIR/head-name"`
357 1) git show-ref
--verify --quiet -- "refs/heads/$1" ||
358 die
"$1 does not seem to be a valid branch"
363 if git checkout
"$branch"; then
364 rm -f "$GIT_DIR/head-name"
369 bisect_clean_state
() {
370 # There may be some refs packed during bisection.
371 git for-each-ref
--format='%(refname) %(objectname)' refs
/bisect
/\
* refs
/heads
/bisect |
374 git update-ref
-d $ref $hash
376 rm -f "$GIT_DIR/BISECT_LOG"
377 rm -f "$GIT_DIR/BISECT_NAMES"
378 rm -f "$GIT_DIR/BISECT_RUN"
382 test -r "$1" || die
"cannot read $1 for replaying"
384 while read bisect
command rev
386 test "$bisect" = "git-bisect" ||
continue
389 cmd
="bisect_start $rev"
392 bisect_write
"$command" "$rev" ;;
394 die
"?? what are you talking about?" ;;
401 bisect_next_check fail
409 # Check for really bad run error.
410 if [ $res -lt 0 -o $res -ge 128 ]; then
411 echo >&2 "bisect run failed:"
412 echo >&2 "exit code $res from '$@' is < 0 or >= 128"
416 # Find current state depending on run success or failure.
417 # A special exit code of 125 means cannot test.
418 if [ $res -eq 125 ]; then
420 elif [ $res -gt 0 ]; then
426 # We have to use a subshell because "bisect_state" can exit.
427 ( bisect_state
$state > "$GIT_DIR/BISECT_RUN" )
430 cat "$GIT_DIR/BISECT_RUN"
432 if grep "first bad commit could be any of" "$GIT_DIR/BISECT_RUN" \
434 echo >&2 "bisect run cannot continue any more"
438 if [ $res -ne 0 ]; then
439 echo >&2 "bisect run failed:"
440 echo >&2 "'bisect_state $state' exited with error code $res"
444 if grep "is first bad commit" "$GIT_DIR/BISECT_RUN" > /dev
/null
; then
445 echo "bisect run success"
463 bisect_state
"$cmd" "$@" ;;
465 # Not sure we want "next" at the UI level anymore.
468 bisect_visualize
"$@" ;;
472 bisect_replay
"$@" ;;
474 cat "$GIT_DIR/BISECT_LOG" ;;