3 USAGE
='[help|start|bad|good|skip|next|reset|visualize|replay|log|run]'
4 LONG_USAGE
='git bisect help
5 print this long help message.
6 git bisect start [--no-checkout] [<bad> [<good>...]] [--] [<pathspec>...]
7 reset bisect state and start bisection.
9 mark <rev> a known-bad revision.
10 git bisect good [<rev>...]
11 mark <rev>... known-good revisions.
12 git bisect skip [(<rev>|<range>)...]
13 mark <rev>... untestable revisions.
15 find next bisection to test and check it out.
16 git bisect reset [<commit>]
17 finish bisection search and go back to commit.
19 show bisect status in gitk.
20 git bisect replay <logfile>
24 git bisect run <cmd>...
25 use <cmd>... to automatically bisect.
27 Please use "git help bisect" to get the full man page.'
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"
40 if test -f "$GIT_DIR/BISECT_HEAD"
49 test -s "$GIT_DIR/BISECT_START" ||
{
50 gettextln
"You need to start by \"git bisect start\"" >&2
53 # TRANSLATORS: Make sure to include [Y] and [n] in your
54 # translation. The program will only accept English input
56 gettext "Do you want me to do it for you [Y/n]? " >&2
71 # Check for one bad and then some good revisions.
75 case "$arg" in --) has_double_dash
=1; break ;; esac
77 orig_args
=$
(git rev-parse
--sq-quote "$@")
82 if test "z$(git rev-parse --is-bare-repository)" != zfalse
88 while [ $# -gt 0 ]; do
99 die
"$(eval_gettext "unrecognised option
: '\$arg'")" ;;
101 rev=$
(git rev-parse
-q --verify "$arg^{commit}") ||
{
102 test $has_double_dash -eq 1 &&
103 die
"$(eval_gettext "'\$arg' does not appear to be a valid revision
")"
114 # The user ran "git bisect start <sha1>
115 # <sha1>", hence did not explicitly specify
116 # the terms, but we are already starting to
117 # set references named with the default terms,
118 # and won't be able to change afterwards.
122 0) state
=$TERM_BAD ; bad_seen
=1 ;;
123 *) state
=$TERM_GOOD ;;
125 eval="$eval bisect_write '$state' '$rev' 'nolog' &&"
130 head=$
(GIT_DIR
="$GIT_DIR" git symbolic-ref
-q HEAD
) ||
131 head=$
(GIT_DIR
="$GIT_DIR" git rev-parse
--verify HEAD
) ||
132 die
"$(gettext "Bad HEAD
- I need a HEAD
")"
135 # Check if we are bisecting.
138 if test -s "$GIT_DIR/BISECT_START"
140 # Reset to the rev from where we started.
141 start_head
=$
(cat "$GIT_DIR/BISECT_START")
142 if test "z$mode" != "z--no-checkout"
144 git checkout
"$start_head" -- ||
145 die
"$(eval_gettext "Checking out
'\$start_head' failed. Try
'git bisect reset <valid-branch>'.
")"
148 # Get rev from where we start.
151 # This error message should only be triggered by
152 # cogito usage, and cogito users should understand
153 # it relates to cg-seek.
154 [ -s "$GIT_DIR/head-name" ] &&
155 die
"$(gettext "won
't bisect on cg-seek'ed tree
")"
156 start_head
="${head#refs/heads/}"
159 die
"$(gettext "Bad HEAD
- strange symbolic ref
")"
165 # Get rid of any old bisect state.
167 bisect_clean_state ||
exit
171 # In case of mistaken revs or checkout error, or signals received,
172 # "bisect_auto_next" below may exit or misbehave.
173 # We have to trap this to be able to clean up using
174 # "bisect_clean_state".
176 trap 'bisect_clean_state' 0
177 trap 'exit 255' 1 2 3 15
180 # Write new start state.
182 echo "$start_head" >"$GIT_DIR/BISECT_START" && {
183 test "z$mode" != "z--no-checkout" ||
184 git update-ref
--no-deref BISECT_HEAD
"$start_head"
186 git rev-parse
--sq-quote "$@" >"$GIT_DIR/BISECT_NAMES" &&
188 if test $must_write_terms -eq 1
190 write_terms
"$TERM_BAD" "$TERM_GOOD"
192 echo "git bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG" ||
exit
194 # Check if we can proceed to the next bisect state.
209 tag
="$state"-"$rev" ;;
211 die
"$(eval_gettext "Bad bisect_write argument
: \
$state")" ;;
213 git update-ref
"refs/bisect/$tag" "$rev" ||
exit
214 echo "# $state: $(git show-branch $rev)" >>"$GIT_DIR/BISECT_LOG"
215 test -n "$nolog" ||
echo "git bisect $state $rev" >>"$GIT_DIR/BISECT_LOG"
219 test -f "$GIT_DIR/BISECT_EXPECTED_REV" &&
220 test "$1" = $
(cat "$GIT_DIR/BISECT_EXPECTED_REV")
223 check_expected_revs
() {
225 if ! is_expected_rev
"$_rev"
227 rm -f "$GIT_DIR/BISECT_ANCESTORS_OK"
228 rm -f "$GIT_DIR/BISECT_EXPECTED_REV"
240 revs
=$
(git rev-list
"$arg") || die
"$(eval_gettext "Bad
rev input
: \
$arg")" ;;
242 revs
=$
(git rev-parse
--sq-quote "$arg") ;;
246 eval bisect_state
'skip' $all
252 check_and_set_terms
$state
255 die
"$(gettext "Please call
'bisect_state' with
at least one argument.
")" ;;
256 1,"$TERM_BAD"|
1,"$TERM_GOOD"|
1,skip
)
257 rev=$
(git rev-parse
--verify $
(bisect_head
)) ||
258 die
"$(gettext "Bad
rev input
: $
(bisect_head
)")"
259 bisect_write
"$state" "$rev"
260 check_expected_revs
"$rev" ;;
261 2,"$TERM_BAD"|
*,"$TERM_GOOD"|
*,skip
)
266 sha
=$
(git rev-parse
--verify "$rev^{commit}") ||
267 die
"$(eval_gettext "Bad
rev input
: \
$rev")"
268 hash_list
="$hash_list $sha"
270 for rev in $hash_list
272 bisect_write
"$state" "$rev"
274 check_expected_revs
$hash_list ;;
276 die
"$(eval_gettext "'git bisect \$TERM_BAD' can take only one argument.
")" ;;
283 bisect_next_check
() {
284 missing_good
= missing_bad
=
285 git show-ref
-q --verify refs
/bisect
/$TERM_BAD || missing_bad
=t
286 test -n "$(git for-each-ref "refs
/bisect
/$TERM_GOOD-*")" || missing_good
=t
288 case "$missing_good,$missing_bad,$1" in
290 : have both
$TERM_GOOD and
$TERM_BAD - ok
293 # do not have both but not asked to fail - just report.
297 # have bad but not good. we could bisect although
298 # this is less optimum.
299 eval_gettextln
"Warning: bisecting only with a \$TERM_BAD commit." >&2
302 # TRANSLATORS: Make sure to include [Y] and [n] in your
303 # translation. The program will only accept English input
305 gettext "Are you sure [Y/n]? " >&2
307 case "$yesno" in [Nn
]*) exit 1 ;; esac
309 : bisect without
$TERM_GOOD...
312 bad_syn
=$
(bisect_voc bad
)
313 good_syn
=$
(bisect_voc good
)
314 if test -s "$GIT_DIR/BISECT_START"
317 eval_gettextln
"You need to give me at least one \$bad_syn and one \$good_syn revision.
318 (You can use \"git bisect \$bad_syn\" and \"git bisect \$good_syn\" for that.)" >&2
320 eval_gettextln
"You need to start by \"git bisect start\".
321 You then need to give me at least one \$good_syn and one \$bad_syn revision.
322 (You can use \"git bisect \$bad_syn\" and \"git bisect \$good_syn\" for that.)" >&2
329 bisect_next_check
&& bisect_next ||
:
333 case "$#" in 0) ;; *) usage
;; esac
335 bisect_next_check
$TERM_GOOD
337 # Perform all bisection computation, display and checkout
338 git bisect--helper
--next-all $
(test -f "$GIT_DIR/BISECT_HEAD" && echo --no-checkout)
341 # Check if we should exit because bisection is finished
344 bad_rev
=$
(git show-ref
--hash --verify refs
/bisect
/$TERM_BAD)
345 bad_commit
=$
(git show-branch
$bad_rev)
346 echo "# first $TERM_BAD commit: $bad_commit" >>"$GIT_DIR/BISECT_LOG"
350 echo "# only skipped commits left to test" >>"$GIT_DIR/BISECT_LOG"
351 good_revs
=$
(git for-each-ref
--format="%(objectname)" "refs/bisect/$TERM_GOOD-*")
352 for skipped
in $
(git rev-list refs
/bisect
/$TERM_BAD --not $good_revs)
354 skipped_commit
=$
(git show-branch
$skipped)
355 echo "# possible first $TERM_BAD commit: $skipped_commit" >>"$GIT_DIR/BISECT_LOG"
360 # Check for an error in the bisection process
361 test $res -ne 0 && exit $res
367 bisect_next_check fail
371 if test -n "${DISPLAY+set}${SESSIONNAME+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" &&
372 type gitk
>/dev
/null
2>&1
381 -*) set git log
"$@" ;;
386 eval '"$@"' --bisect -- $
(cat "$GIT_DIR/BISECT_NAMES")
390 test -s "$GIT_DIR/BISECT_START" ||
{
391 gettextln
"We are not bisecting."
395 0) branch
=$
(cat "$GIT_DIR/BISECT_START") ;;
396 1) git rev-parse
--quiet --verify "$1^{commit}" >/dev
/null ||
{
398 die
"$(eval_gettext "'\$invalid' is not a valid commit
")"
405 if ! test -f "$GIT_DIR/BISECT_HEAD" && ! git checkout
"$branch" --
407 die
"$(eval_gettext "Could not check out original HEAD
'\$branch'.
408 Try
'git bisect reset <commit>'.
")"
413 bisect_clean_state
() {
414 # There may be some refs packed during bisection.
415 git for-each-ref
--format='%(refname) %(objectname)' refs
/bisect
/\
* |
418 git update-ref
-d $ref $hash ||
exit
420 rm -f "$GIT_DIR/BISECT_EXPECTED_REV" &&
421 rm -f "$GIT_DIR/BISECT_ANCESTORS_OK" &&
422 rm -f "$GIT_DIR/BISECT_LOG" &&
423 rm -f "$GIT_DIR/BISECT_NAMES" &&
424 rm -f "$GIT_DIR/BISECT_RUN" &&
425 rm -f "$GIT_DIR/BISECT_TERMS" &&
426 # Cleanup head-name if it got left by an old version of git-bisect
427 rm -f "$GIT_DIR/head-name" &&
428 git update-ref
-d --no-deref BISECT_HEAD
&&
429 # clean up BISECT_START last
430 rm -f "$GIT_DIR/BISECT_START"
435 test "$#" -eq 1 || die
"$(gettext "No logfile given
")"
436 test -r "$file" || die
"$(eval_gettext "cannot
read \
$file for replaying
")"
438 while read git bisect
command rev
440 test "$git $bisect" = "git bisect" ||
test "$git" = "git-bisect" ||
continue
441 if test "$git" = "git-bisect"
447 check_and_set_terms
"$command"
450 cmd
="bisect_start $rev"
452 "$TERM_GOOD"|
"$TERM_BAD"|skip
)
453 bisect_write
"$command" "$rev" ;;
455 die
"$(gettext "?? what are you talking about?
")" ;;
462 bisect_next_check fail
467 eval_gettextln
"running \$command"
471 # Check for really bad run error.
472 if [ $res -lt 0 -o $res -ge 128 ]
474 eval_gettextln
"bisect run failed:
475 exit code \$res from '\$command' is < 0 or >= 128" >&2
479 # Find current state depending on run success or failure.
480 # A special exit code of 125 means cannot test.
491 # We have to use a subshell because "bisect_state" can exit.
492 ( bisect_state
$state >"$GIT_DIR/BISECT_RUN" )
495 cat "$GIT_DIR/BISECT_RUN"
497 if sane_grep
"first $TERM_BAD commit could be any of" "$GIT_DIR/BISECT_RUN" \
500 gettextln
"bisect run cannot continue any more" >&2
506 eval_gettextln
"bisect run failed:
507 'bisect_state \$state' exited with error code \$res" >&2
511 if sane_grep
"is the first $TERM_BAD commit" "$GIT_DIR/BISECT_RUN" >/dev
/null
513 gettextln
"bisect run success"
521 test -s "$GIT_DIR/BISECT_LOG" || die
"$(gettext "We are not bisecting.
")"
522 cat "$GIT_DIR/BISECT_LOG"
526 if test -s "$GIT_DIR/BISECT_TERMS"
531 } <"$GIT_DIR/BISECT_TERMS"
538 printf '%s\n%s\n' "$TERM_BAD" "$TERM_GOOD" >"$GIT_DIR/BISECT_TERMS"
541 check_and_set_terms
() {
546 if test -s "$GIT_DIR/BISECT_TERMS" && test "$cmd" != "$TERM_BAD" && test "$cmd" != "$TERM_GOOD"
548 die
"$(eval_gettext "Invalid
command: you
're currently in a \$TERM_BAD/\$TERM_GOOD bisect.")"
552 if ! test -s "$GIT_DIR/BISECT_TERMS"
580 bad|good|"$TERM_BAD"|"$TERM_GOOD")
581 bisect_state "$cmd" "$@" ;;
585 # Not sure we want "next" at the UI level anymore.
588 bisect_visualize "$@" ;;
592 bisect_replay "$@" ;;