3 USAGE
='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|replay|log|run]'
4 LONG_USAGE
='git bisect help
5 print this long help message.
6 git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>]
7 [--no-checkout] [<bad> [<good>...]] [--] [<pathspec>...]
8 reset bisect state and start bisection.
9 git bisect (bad|new) [<rev>]
10 mark <rev> a known-bad revision/
11 a revision after change in a given property.
12 git bisect (good|old) [<rev>...]
13 mark <rev>... known-good revisions/
14 revisions before change in a given property.
15 git bisect terms [--term-good | --term-bad]
16 show the terms used for old and new commits (default: bad, good)
17 git bisect skip [(<rev>|<range>)...]
18 mark <rev>... untestable revisions.
20 find next bisection to test and check it out.
21 git bisect reset [<commit>]
22 finish bisection search and go back to commit.
24 show bisect status in gitk.
25 git bisect replay <logfile>
29 git bisect run <cmd>...
30 use <cmd>... to automatically bisect.
32 Please use "git help bisect" to get the full man page.'
37 _x40
='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
38 _x40
="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
44 if test -f "$GIT_DIR/BISECT_HEAD"
53 test -s "$GIT_DIR/BISECT_START" ||
{
54 gettextln
"You need to start by \"git bisect start\"" >&2
57 # TRANSLATORS: Make sure to include [Y] and [n] in your
58 # translation. The program will only accept English input
60 gettext "Do you want me to do it for you [Y/n]? " >&2
75 # Check for one bad and then some good revisions.
79 case "$arg" in --) has_double_dash
=1; break ;; esac
81 orig_args
=$
(git rev-parse
--sq-quote "$@")
86 if test "z$(git rev-parse --is-bare-repository)" != zfalse
92 while [ $# -gt 0 ]; do
102 --term-good|
--term-old)
107 --term-good=*|
--term-old=*)
111 --term-bad|
--term-new)
116 --term-bad=*|
--term-new=*)
121 die
"$(eval_gettext "unrecognised option
: '\$arg'")" ;;
123 rev=$
(git rev-parse
-q --verify "$arg^{commit}") ||
{
124 test $has_double_dash -eq 1 &&
125 die
"$(eval_gettext "'\$arg' does not appear to be a valid revision
")"
136 # The user ran "git bisect start <sha1>
137 # <sha1>", hence did not explicitly specify
138 # the terms, but we are already starting to
139 # set references named with the default terms,
140 # and won't be able to change afterwards.
144 0) state
=$TERM_BAD ; bad_seen
=1 ;;
145 *) state
=$TERM_GOOD ;;
147 eval="$eval bisect_write '$state' '$rev' 'nolog' &&"
152 head=$
(GIT_DIR
="$GIT_DIR" git symbolic-ref
-q HEAD
) ||
153 head=$
(GIT_DIR
="$GIT_DIR" git rev-parse
--verify HEAD
) ||
154 die
"$(gettext "Bad HEAD
- I need a HEAD
")"
157 # Check if we are bisecting.
160 if test -s "$GIT_DIR/BISECT_START"
162 # Reset to the rev from where we started.
163 start_head
=$
(cat "$GIT_DIR/BISECT_START")
164 if test "z$mode" != "z--no-checkout"
166 git checkout
"$start_head" -- ||
167 die
"$(eval_gettext "Checking out
'\$start_head' failed. Try
'git bisect reset <valid-branch>'.
")"
170 # Get rev from where we start.
173 # This error message should only be triggered by
174 # cogito usage, and cogito users should understand
175 # it relates to cg-seek.
176 [ -s "$GIT_DIR/head-name" ] &&
177 die
"$(gettext "won
't bisect on cg-seek'ed tree
")"
178 start_head
="${head#refs/heads/}"
181 die
"$(gettext "Bad HEAD
- strange symbolic ref
")"
187 # Get rid of any old bisect state.
189 bisect_clean_state ||
exit
193 # In case of mistaken revs or checkout error, or signals received,
194 # "bisect_auto_next" below may exit or misbehave.
195 # We have to trap this to be able to clean up using
196 # "bisect_clean_state".
198 trap 'bisect_clean_state' 0
199 trap 'exit 255' 1 2 3 15
202 # Write new start state.
204 echo "$start_head" >"$GIT_DIR/BISECT_START" && {
205 test "z$mode" != "z--no-checkout" ||
206 git update-ref
--no-deref BISECT_HEAD
"$start_head"
208 git rev-parse
--sq-quote "$@" >"$GIT_DIR/BISECT_NAMES" &&
210 if test $must_write_terms -eq 1
212 write_terms
"$TERM_BAD" "$TERM_GOOD"
214 echo "git bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG" ||
exit
216 # Check if we can proceed to the next bisect state.
231 tag
="$state"-"$rev" ;;
233 die
"$(eval_gettext "Bad bisect_write argument
: \
$state")" ;;
235 git update-ref
"refs/bisect/$tag" "$rev" ||
exit
236 echo "# $state: $(git show-branch $rev)" >>"$GIT_DIR/BISECT_LOG"
237 test -n "$nolog" ||
echo "git bisect $state $rev" >>"$GIT_DIR/BISECT_LOG"
241 test -f "$GIT_DIR/BISECT_EXPECTED_REV" &&
242 test "$1" = $
(cat "$GIT_DIR/BISECT_EXPECTED_REV")
245 check_expected_revs
() {
247 if ! is_expected_rev
"$_rev"
249 rm -f "$GIT_DIR/BISECT_ANCESTORS_OK"
250 rm -f "$GIT_DIR/BISECT_EXPECTED_REV"
262 revs
=$
(git rev-list
"$arg") || die
"$(eval_gettext "Bad
rev input
: \
$arg")" ;;
264 revs
=$
(git rev-parse
--sq-quote "$arg") ;;
268 eval bisect_state
'skip' $all
274 check_and_set_terms
$state
277 die
"Please call 'bisect_state' with at least one argument." ;;
278 1,"$TERM_BAD"|
1,"$TERM_GOOD"|
1,skip
)
279 bisected_head
=$
(bisect_head
)
280 rev=$
(git rev-parse
--verify "$bisected_head") ||
281 die
"$(eval_gettext "Bad
rev input
: \
$bisected_head")"
282 bisect_write
"$state" "$rev"
283 check_expected_revs
"$rev" ;;
284 2,"$TERM_BAD"|
*,"$TERM_GOOD"|
*,skip
)
289 sha
=$
(git rev-parse
--verify "$rev^{commit}") ||
290 die
"$(eval_gettext "Bad
rev input
: \
$rev")"
291 hash_list
="$hash_list $sha"
293 for rev in $hash_list
295 bisect_write
"$state" "$rev"
297 check_expected_revs
$hash_list ;;
299 die
"$(eval_gettext "'git bisect \$TERM_BAD' can take only one argument.
")" ;;
306 bisect_next_check
() {
307 missing_good
= missing_bad
=
308 git show-ref
-q --verify refs
/bisect
/$TERM_BAD || missing_bad
=t
309 test -n "$(git for-each-ref "refs
/bisect
/$TERM_GOOD-*")" || missing_good
=t
311 case "$missing_good,$missing_bad,$1" in
313 : have both
$TERM_GOOD and
$TERM_BAD - ok
316 # do not have both but not asked to fail - just report.
320 # have bad (or new) but not good (or old). we could bisect although
321 # this is less optimum.
322 eval_gettextln
"Warning: bisecting only with a \$TERM_BAD commit." >&2
325 # TRANSLATORS: Make sure to include [Y] and [n] in your
326 # translation. The program will only accept English input
328 gettext "Are you sure [Y/n]? " >&2
330 case "$yesno" in [Nn
]*) exit 1 ;; esac
332 : bisect without
$TERM_GOOD...
335 bad_syn
=$
(bisect_voc bad
)
336 good_syn
=$
(bisect_voc good
)
337 if test -s "$GIT_DIR/BISECT_START"
340 eval_gettextln
"You need to give me at least one \$bad_syn and one \$good_syn revision.
341 (You can use \"git bisect \$bad_syn\" and \"git bisect \$good_syn\" for that.)" >&2
343 eval_gettextln
"You need to start by \"git bisect start\".
344 You then need to give me at least one \$good_syn and one \$bad_syn revision.
345 (You can use \"git bisect \$bad_syn\" and \"git bisect \$good_syn\" for that.)" >&2
352 bisect_next_check
&& bisect_next ||
:
356 case "$#" in 0) ;; *) usage
;; esac
358 bisect_next_check
$TERM_GOOD
360 # Perform all bisection computation, display and checkout
361 git bisect--helper
--next-all $
(test -f "$GIT_DIR/BISECT_HEAD" && echo --no-checkout)
364 # Check if we should exit because bisection is finished
367 bad_rev
=$
(git show-ref
--hash --verify refs
/bisect
/$TERM_BAD)
368 bad_commit
=$
(git show-branch
$bad_rev)
369 echo "# first $TERM_BAD commit: $bad_commit" >>"$GIT_DIR/BISECT_LOG"
373 echo "# only skipped commits left to test" >>"$GIT_DIR/BISECT_LOG"
374 good_revs
=$
(git for-each-ref
--format="%(objectname)" "refs/bisect/$TERM_GOOD-*")
375 for skipped
in $
(git rev-list refs
/bisect
/$TERM_BAD --not $good_revs)
377 skipped_commit
=$
(git show-branch
$skipped)
378 echo "# possible first $TERM_BAD commit: $skipped_commit" >>"$GIT_DIR/BISECT_LOG"
383 # Check for an error in the bisection process
384 test $res -ne 0 && exit $res
390 bisect_next_check fail
394 if test -n "${DISPLAY+set}${SESSIONNAME+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" &&
395 type gitk
>/dev
/null
2>&1
404 -*) set git log
"$@" ;;
409 eval '"$@"' --bisect -- $
(cat "$GIT_DIR/BISECT_NAMES")
413 test -s "$GIT_DIR/BISECT_START" ||
{
414 gettextln
"We are not bisecting."
418 0) branch
=$
(cat "$GIT_DIR/BISECT_START") ;;
419 1) git rev-parse
--quiet --verify "$1^{commit}" >/dev
/null ||
{
421 die
"$(eval_gettext "'\$invalid' is not a valid commit
")"
428 if ! test -f "$GIT_DIR/BISECT_HEAD" && ! git checkout
"$branch" --
430 die
"$(eval_gettext "Could not check out original HEAD
'\$branch'.
431 Try
'git bisect reset <commit>'.
")"
436 bisect_clean_state
() {
437 # There may be some refs packed during bisection.
438 git for-each-ref
--format='%(refname) %(objectname)' refs
/bisect
/\
* |
441 git update-ref
-d $ref $hash ||
exit
443 rm -f "$GIT_DIR/BISECT_EXPECTED_REV" &&
444 rm -f "$GIT_DIR/BISECT_ANCESTORS_OK" &&
445 rm -f "$GIT_DIR/BISECT_LOG" &&
446 rm -f "$GIT_DIR/BISECT_NAMES" &&
447 rm -f "$GIT_DIR/BISECT_RUN" &&
448 rm -f "$GIT_DIR/BISECT_TERMS" &&
449 # Cleanup head-name if it got left by an old version of git-bisect
450 rm -f "$GIT_DIR/head-name" &&
451 git update-ref
-d --no-deref BISECT_HEAD
&&
452 # clean up BISECT_START last
453 rm -f "$GIT_DIR/BISECT_START"
458 test "$#" -eq 1 || die
"$(gettext "No logfile given
")"
459 test -r "$file" || die
"$(eval_gettext "cannot
read \
$file for replaying
")"
461 while read git bisect
command rev
463 test "$git $bisect" = "git bisect" ||
test "$git" = "git-bisect" ||
continue
464 if test "$git" = "git-bisect"
470 check_and_set_terms
"$command"
473 cmd
="bisect_start $rev"
475 "$TERM_GOOD"|
"$TERM_BAD"|skip
)
476 bisect_write
"$command" "$rev" ;;
480 die
"$(gettext "?? what are you talking about?
")" ;;
487 bisect_next_check fail
492 eval_gettextln
"running \$command"
496 # Check for really bad run error.
497 if [ $res -lt 0 -o $res -ge 128 ]
499 eval_gettextln
"bisect run failed:
500 exit code \$res from '\$command' is < 0 or >= 128" >&2
504 # Find current state depending on run success or failure.
505 # A special exit code of 125 means cannot test.
516 # We have to use a subshell because "bisect_state" can exit.
517 ( bisect_state
$state >"$GIT_DIR/BISECT_RUN" )
520 cat "$GIT_DIR/BISECT_RUN"
522 if sane_grep
"first $TERM_BAD commit could be any of" "$GIT_DIR/BISECT_RUN" \
525 gettextln
"bisect run cannot continue any more" >&2
531 eval_gettextln
"bisect run failed:
532 'bisect_state \$state' exited with error code \$res" >&2
536 if sane_grep
"is the first $TERM_BAD commit" "$GIT_DIR/BISECT_RUN" >/dev
/null
538 gettextln
"bisect run success"
546 test -s "$GIT_DIR/BISECT_LOG" || die
"$(gettext "We are not bisecting.
")"
547 cat "$GIT_DIR/BISECT_LOG"
551 if test -s "$GIT_DIR/BISECT_TERMS"
556 } <"$GIT_DIR/BISECT_TERMS"
563 if test "$TERM_BAD" = "$TERM_GOOD"
565 die
"$(gettext "please use two different terms
")"
567 check_term_format
"$TERM_BAD" bad
568 check_term_format
"$TERM_GOOD" good
569 printf '%s\n%s\n' "$TERM_BAD" "$TERM_GOOD" >"$GIT_DIR/BISECT_TERMS"
572 check_term_format
() {
574 git check-ref-format refs
/bisect
/"$term" ||
575 die
"$(eval_gettext "'\$term' is not a valid term
")"
577 help|start|terms|skip|next|
reset|visualize|replay|log|run
)
578 die
"$(eval_gettext "can
't use the builtin command '\
$term' as a term")"
583 # In theory, nothing prevents swapping
584 # completely good and bad, but this situation
585 # could be confusing and hasn't been tested
586 # enough. Forbid it for now.
587 die
"$(eval_gettext "can
't change the meaning of term '\
$term'")"
593 die "$(eval_gettext "can't change the meaning of term
'\$term'")"
599 check_and_set_terms
() {
604 if test -s "$GIT_DIR/BISECT_TERMS" && test "$cmd" != "$TERM_BAD" && test "$cmd" != "$TERM_GOOD"
606 die
"$(eval_gettext "Invalid
command: you
're currently in a \$TERM_BAD/\$TERM_GOOD bisect.")"
610 if ! test -s "$GIT_DIR/BISECT_TERMS"
616 if ! test -s "$GIT_DIR/BISECT_TERMS"
627 bad) echo "bad|new" ;;
628 good) echo "good|old" ;;
634 if ! test -s "$GIT_DIR/BISECT_TERMS"
636 die "$(gettext "no terms defined")"
640 gettextln "Your current terms are $TERM_GOOD for the old state
641 and $TERM_BAD for the new state."
646 --term-good|--term-old)
647 printf '%s
\n' "$TERM_GOOD"
649 --term-bad|--term-new)
650 printf '%s
\n' "$TERM_BAD"
653 die "$(eval_gettext "invalid argument \$arg for 'git bisect terms
'.
654 Supported options are: --term-good|--term-old and --term-bad|--term-new.")"
675 bad|good|new|old|"$TERM_BAD"|"$TERM_GOOD")
676 bisect_state "$cmd" "$@" ;;
680 # Not sure we want "next" at the UI level anymore.
683 bisect_visualize "$@" ;;
687 bisect_replay "$@" ;;