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 "$@")
81 if test "z$(git rev-parse --is-bare-repository)" != zfalse
87 while [ $# -gt 0 ]; do
98 die
"$(eval_gettext "unrecognised option
: '\$arg'")" ;;
100 rev=$
(git rev-parse
-q --verify "$arg^{commit}") ||
{
101 test $has_double_dash -eq 1 &&
102 die
"$(eval_gettext "'\$arg' does not appear to be a valid revision
")"
106 # The user ran "git bisect start <sha1>
107 # <sha1>", hence did not explicitly specify
108 # the terms, but we are already starting to
109 # set references named with the default terms,
110 # and won't be able to change afterwards.
114 0) state
=$TERM_BAD ; bad_seen
=1 ;;
115 *) state
=$TERM_GOOD ;;
117 eval="$eval bisect_write '$state' '$rev' 'nolog' &&"
126 head=$
(GIT_DIR
="$GIT_DIR" git symbolic-ref
-q HEAD
) ||
127 head=$
(GIT_DIR
="$GIT_DIR" git rev-parse
--verify HEAD
) ||
128 die
"$(gettext "Bad HEAD
- I need a HEAD
")"
131 # Check if we are bisecting.
134 if test -s "$GIT_DIR/BISECT_START"
136 # Reset to the rev from where we started.
137 start_head
=$
(cat "$GIT_DIR/BISECT_START")
138 if test "z$mode" != "z--no-checkout"
140 git checkout
"$start_head" -- ||
141 die
"$(eval_gettext "Checking out
'\$start_head' failed. Try
'git bisect reset <valid-branch>'.
")"
144 # Get rev from where we start.
147 # This error message should only be triggered by
148 # cogito usage, and cogito users should understand
149 # it relates to cg-seek.
150 [ -s "$GIT_DIR/head-name" ] &&
151 die
"$(gettext "won
't bisect on cg-seek'ed tree
")"
152 start_head
="${head#refs/heads/}"
155 die
"$(gettext "Bad HEAD
- strange symbolic ref
")"
161 # Get rid of any old bisect state.
163 bisect_clean_state ||
exit
167 # In case of mistaken revs or checkout error, or signals received,
168 # "bisect_auto_next" below may exit or misbehave.
169 # We have to trap this to be able to clean up using
170 # "bisect_clean_state".
172 trap 'bisect_clean_state' 0
173 trap 'exit 255' 1 2 3 15
176 # Write new start state.
178 echo "$start_head" >"$GIT_DIR/BISECT_START" && {
179 test "z$mode" != "z--no-checkout" ||
180 git update-ref
--no-deref BISECT_HEAD
"$start_head"
182 git rev-parse
--sq-quote "$@" >"$GIT_DIR/BISECT_NAMES" &&
184 if test $must_write_terms -eq 1
186 write_terms
"$TERM_BAD" "$TERM_GOOD"
188 echo "git bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG" ||
exit
190 # Check if we can proceed to the next bisect state.
205 tag
="$state"-"$rev" ;;
207 die
"$(eval_gettext "Bad bisect_write argument
: \
$state")" ;;
209 git update-ref
"refs/bisect/$tag" "$rev" ||
exit
210 echo "# $state: $(git show-branch $rev)" >>"$GIT_DIR/BISECT_LOG"
211 test -n "$nolog" ||
echo "git bisect $state $rev" >>"$GIT_DIR/BISECT_LOG"
215 test -f "$GIT_DIR/BISECT_EXPECTED_REV" &&
216 test "$1" = $
(cat "$GIT_DIR/BISECT_EXPECTED_REV")
219 check_expected_revs
() {
221 if ! is_expected_rev
"$_rev"
223 rm -f "$GIT_DIR/BISECT_ANCESTORS_OK"
224 rm -f "$GIT_DIR/BISECT_EXPECTED_REV"
236 revs
=$
(git rev-list
"$arg") || die
"$(eval_gettext "Bad
rev input
: \
$arg")" ;;
238 revs
=$
(git rev-parse
--sq-quote "$arg") ;;
242 eval bisect_state
'skip' $all
248 check_and_set_terms
$state
251 die
"$(gettext "Please call
'bisect_state' with
at least one argument.
")" ;;
252 1,"$TERM_BAD"|
1,"$TERM_GOOD"|
1,skip
)
253 rev=$
(git rev-parse
--verify $
(bisect_head
)) ||
254 die
"$(gettext "Bad
rev input
: $
(bisect_head
)")"
255 bisect_write
"$state" "$rev"
256 check_expected_revs
"$rev" ;;
257 2,"$TERM_BAD"|
*,"$TERM_GOOD"|
*,skip
)
262 sha
=$
(git rev-parse
--verify "$rev^{commit}") ||
263 die
"$(eval_gettext "Bad
rev input
: \
$rev")"
264 hash_list
="$hash_list $sha"
266 for rev in $hash_list
268 bisect_write
"$state" "$rev"
270 check_expected_revs
$hash_list ;;
272 die
"$(eval_gettext "'git bisect \$TERM_BAD' can take only one argument.
")" ;;
279 bisect_next_check
() {
280 missing_good
= missing_bad
=
281 git show-ref
-q --verify refs
/bisect
/$TERM_BAD || missing_bad
=t
282 test -n "$(git for-each-ref "refs
/bisect
/$TERM_GOOD-*")" || missing_good
=t
284 case "$missing_good,$missing_bad,$1" in
286 : have both
$TERM_GOOD and
$TERM_BAD - ok
289 # do not have both but not asked to fail - just report.
293 # have bad but not good. we could bisect although
294 # this is less optimum.
295 eval_gettextln
"Warning: bisecting only with a \$TERM_BAD commit." >&2
298 # TRANSLATORS: Make sure to include [Y] and [n] in your
299 # translation. The program will only accept English input
301 gettext "Are you sure [Y/n]? " >&2
303 case "$yesno" in [Nn
]*) exit 1 ;; esac
305 : bisect without
$TERM_GOOD...
308 bad_syn
=$
(bisect_voc bad
)
309 good_syn
=$
(bisect_voc good
)
310 if test -s "$GIT_DIR/BISECT_START"
313 eval_gettextln
"You need to give me at least one \$bad_syn and one \$good_syn revision.
314 (You can use \"git bisect \$bad_syn\" and \"git bisect \$good_syn\" for that.)" >&2
316 eval_gettextln
"You need to start by \"git bisect start\".
317 You then need to give me at least one \$good_syn and one \$bad_syn revision.
318 (You can use \"git bisect \$bad_syn\" and \"git bisect \$good_syn\" for that.)" >&2
325 bisect_next_check
&& bisect_next ||
:
329 case "$#" in 0) ;; *) usage
;; esac
331 bisect_next_check
$TERM_GOOD
333 # Perform all bisection computation, display and checkout
334 git bisect--helper
--next-all $
(test -f "$GIT_DIR/BISECT_HEAD" && echo --no-checkout)
337 # Check if we should exit because bisection is finished
340 bad_rev
=$
(git show-ref
--hash --verify refs
/bisect
/$TERM_BAD)
341 bad_commit
=$
(git show-branch
$bad_rev)
342 echo "# first $TERM_BAD commit: $bad_commit" >>"$GIT_DIR/BISECT_LOG"
346 echo "# only skipped commits left to test" >>"$GIT_DIR/BISECT_LOG"
347 good_revs
=$
(git for-each-ref
--format="%(objectname)" "refs/bisect/$TERM_GOOD-*")
348 for skipped
in $
(git rev-list refs
/bisect
/$TERM_BAD --not $good_revs)
350 skipped_commit
=$
(git show-branch
$skipped)
351 echo "# possible first $TERM_BAD commit: $skipped_commit" >>"$GIT_DIR/BISECT_LOG"
356 # Check for an error in the bisection process
357 test $res -ne 0 && exit $res
363 bisect_next_check fail
367 if test -n "${DISPLAY+set}${SESSIONNAME+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" &&
368 type gitk
>/dev
/null
2>&1
377 -*) set git log
"$@" ;;
382 eval '"$@"' --bisect -- $
(cat "$GIT_DIR/BISECT_NAMES")
386 test -s "$GIT_DIR/BISECT_START" ||
{
387 gettextln
"We are not bisecting."
391 0) branch
=$
(cat "$GIT_DIR/BISECT_START") ;;
392 1) git rev-parse
--quiet --verify "$1^{commit}" >/dev
/null ||
{
394 die
"$(eval_gettext "'\$invalid' is not a valid commit
")"
401 if ! test -f "$GIT_DIR/BISECT_HEAD" && ! git checkout
"$branch" --
403 die
"$(eval_gettext "Could not check out original HEAD
'\$branch'.
404 Try
'git bisect reset <commit>'.
")"
409 bisect_clean_state
() {
410 # There may be some refs packed during bisection.
411 git for-each-ref
--format='%(refname) %(objectname)' refs
/bisect
/\
* |
414 git update-ref
-d $ref $hash ||
exit
416 rm -f "$GIT_DIR/BISECT_EXPECTED_REV" &&
417 rm -f "$GIT_DIR/BISECT_ANCESTORS_OK" &&
418 rm -f "$GIT_DIR/BISECT_LOG" &&
419 rm -f "$GIT_DIR/BISECT_NAMES" &&
420 rm -f "$GIT_DIR/BISECT_RUN" &&
421 rm -f "$GIT_DIR/BISECT_TERMS" &&
422 # Cleanup head-name if it got left by an old version of git-bisect
423 rm -f "$GIT_DIR/head-name" &&
424 git update-ref
-d --no-deref BISECT_HEAD
&&
425 # clean up BISECT_START last
426 rm -f "$GIT_DIR/BISECT_START"
431 test "$#" -eq 1 || die
"$(gettext "No logfile given
")"
432 test -r "$file" || die
"$(eval_gettext "cannot
read \
$file for replaying
")"
434 while read git bisect
command rev
436 test "$git $bisect" = "git bisect" ||
test "$git" = "git-bisect" ||
continue
437 if test "$git" = "git-bisect"
443 check_and_set_terms
"$command"
446 cmd
="bisect_start $rev"
448 "$TERM_GOOD"|
"$TERM_BAD"|skip
)
449 bisect_write
"$command" "$rev" ;;
451 die
"$(gettext "?? what are you talking about?
")" ;;
458 bisect_next_check fail
463 eval_gettextln
"running \$command"
467 # Check for really bad run error.
468 if [ $res -lt 0 -o $res -ge 128 ]
470 eval_gettextln
"bisect run failed:
471 exit code \$res from '\$command' is < 0 or >= 128" >&2
475 # Find current state depending on run success or failure.
476 # A special exit code of 125 means cannot test.
487 # We have to use a subshell because "bisect_state" can exit.
488 ( bisect_state
$state >"$GIT_DIR/BISECT_RUN" )
491 cat "$GIT_DIR/BISECT_RUN"
493 if sane_grep
"first $TERM_BAD commit could be any of" "$GIT_DIR/BISECT_RUN" \
496 gettextln
"bisect run cannot continue any more" >&2
502 eval_gettextln
"bisect run failed:
503 'bisect_state \$state' exited with error code \$res" >&2
507 if sane_grep
"is the first $TERM_BAD commit" "$GIT_DIR/BISECT_RUN" >/dev
/null
509 gettextln
"bisect run success"
517 test -s "$GIT_DIR/BISECT_LOG" || die
"$(gettext "We are not bisecting.
")"
518 cat "$GIT_DIR/BISECT_LOG"
522 if test -s "$GIT_DIR/BISECT_TERMS"
527 } <"$GIT_DIR/BISECT_TERMS"
534 printf '%s\n%s\n' "$TERM_BAD" "$TERM_GOOD" >"$GIT_DIR/BISECT_TERMS"
537 check_and_set_terms
() {
542 if test -s "$GIT_DIR/BISECT_TERMS" && test "$cmd" != "$TERM_BAD" && test "$cmd" != "$TERM_GOOD"
544 die
"$(eval_gettext "Invalid
command: you
're currently in a \$TERM_BAD/\$TERM_GOOD bisect.")"
548 if ! test -s "$GIT_DIR/BISECT_TERMS"
576 bad|good|"$TERM_BAD"|"$TERM_GOOD")
577 bisect_state "$cmd" "$@" ;;
581 # Not sure we want "next" at the UI level anymore.
584 bisect_visualize "$@" ;;
588 bisect_replay "$@" ;;