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 [<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>...]
13 mark <rev>... untestable revisions.
15 find next bisection to test and check it out.
16 git bisect reset [<branch>]
17 finish bisection search and go back to branch.
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"
39 s/'\''/'\'\\\\\'\''/g;
47 test -f "$GIT_DIR/BISECT_NAMES" ||
{
48 echo >&2 'You need to start by "git bisect start"'
51 echo >&2 -n 'Do you want me to do it for you [Y/n]? '
66 # Verify HEAD. If we were bisecting before this, reset to the
67 # top-of-line master first!
69 head=$
(GIT_DIR
="$GIT_DIR" git symbolic-ref
-q HEAD
) ||
70 head=$
(GIT_DIR
="$GIT_DIR" git rev-parse
--verify HEAD
) ||
71 die
"Bad HEAD - I need a HEAD"
73 # Check that we either already have BISECT_START, or that the
74 # branches bisect, new-bisect don't exist, to not override them.
76 test -s "$GIT_DIR/BISECT_START" ||
77 if git show-ref
--verify -q refs
/heads
/bisect ||
78 git show-ref
--verify -q refs
/heads
/new-bisect
; then
79 die
'The branches "bisect" and "new-bisect" must not exist.'
84 branch
=`cat "$GIT_DIR/BISECT_START"`
85 git checkout
$branch ||
exit
88 # This error message should only be triggered by cogito usage,
89 # and cogito users should understand it relates to cg-seek.
90 [ -s "$GIT_DIR/head-name" ] && die
"won't bisect on seeked tree"
91 start_head
="${head#refs/heads/}"
94 die
"Bad HEAD - strange symbolic ref"
99 # Get rid of any old bisect state
104 # Check for one bad and then some good revisions.
108 case "$arg" in --) has_double_dash
=1; break ;; esac
113 while [ $# -gt 0 ]; do
121 rev=$
(git rev-parse
--verify "$arg^{commit}" 2>/dev
/null
) ||
{
122 test $has_double_dash -eq 1 &&
123 die
"'$arg' does not appear to be a valid revision"
127 0) state
='bad' ; bad_seen
=1 ;;
130 eval="$eval bisect_write '$state' '$rev' 'nolog'; "
136 sq "$@" >"$GIT_DIR/BISECT_NAMES"
137 test -n "$start_head" && echo "$start_head" >"$GIT_DIR/BISECT_START"
139 echo "git-bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG"
149 good|skip
) tag
="$state"-"$rev" ;;
150 *) die
"Bad bisect_write argument: $state" ;;
152 git update-ref
"refs/bisect/$tag" "$rev"
153 echo "# $state: $(git show-branch $rev)" >>"$GIT_DIR/BISECT_LOG"
154 test -z "$nolog" && echo "git-bisect $state $rev" >>"$GIT_DIR/BISECT_LOG"
162 die
"Please call 'bisect_state' with at least one argument." ;;
164 rev=$
(git rev-parse
--verify HEAD
) ||
165 die
"Bad rev input: HEAD"
166 bisect_write
"$state" "$rev" ;;
172 sha
=$
(git rev-parse
--verify "$rev^{commit}") ||
173 die
"Bad rev input: $rev"
174 eval="$eval bisect_write '$state' '$sha'; "
178 die
"'git bisect bad' can take only one argument." ;;
185 bisect_next_check
() {
186 missing_good
= missing_bad
=
187 git show-ref
-q --verify refs
/bisect
/bad || missing_bad
=t
188 test -n "$(git for-each-ref "refs
/bisect
/good-
*")" || missing_good
=t
190 case "$missing_good,$missing_bad,$1" in
192 : have both good and bad
- ok
195 # do not have both but not asked to fail - just report.
199 # have bad but not good. we could bisect although
200 # this is less optimum.
201 echo >&2 'Warning: bisecting only with a bad commit.'
204 printf >&2 'Are you sure [Y/n]? '
205 case "$(read yesno)" in [Nn
]*) exit 1 ;; esac
207 : bisect without good...
211 test -f "$GIT_DIR/BISECT_NAMES" ||
{
212 echo >&2 'You need to start by "git bisect start".'
215 echo >&2 'You '$THEN'need to give me at least one good' \
216 'and one bad revisions.'
217 echo >&2 '(You can use "git bisect bad" and' \
218 '"git bisect good" for that.)'
224 bisect_next_check
&& bisect_next ||
:
231 if [ -z "$_skip" ]; then
236 # Let's parse the output of:
237 # "git rev-list --bisect-vars --bisect-all ..."
238 eval $_eval |
while read hash line
240 case "$VARS,$FOUND,$TRIED,$hash" in
241 # We display some vars.
242 1,*,*,*) echo "$hash $line" ;;
247 # We had nothing to search.
253 # We did not find a good bisect rev.
254 # This should happen only if the "bad"
255 # commit is also a "skip" commit.
257 echo "bisect_rev=$TRIED"
263 TRIED
="${TRIED:+$TRIED|}$hash"
267 echo "bisect_rev=$hash"
268 echo "bisect_tried=\"$TRIED\""
274 # We have already found a rev to be tested.
275 ,1,*,bisect_rev
*) VARS
=1 ;;
279 *) die
"filter_skipped error " \
290 exit_if_skipped_commits
() {
292 if expr "$_tried" : ".*[|].*" > /dev
/null
; then
293 echo "There are only 'skip'ped commit left to test."
294 echo "The first bad commit could be any of:"
295 echo "$_tried" |
tr '[|]' '[\012]'
296 echo "We cannot bisect more!"
302 case "$#" in 0) ;; *) usage
;; esac
304 bisect_next_check good
306 skip
=$
(git for-each-ref
--format='%(objectname)' \
307 "refs/bisect/skip-*" |
tr '\012' ' ') ||
exit
310 test -n "$skip" && BISECT_OPT
='--bisect-all'
312 bad
=$
(git rev-parse
--verify refs
/bisect
/bad
) &&
313 good
=$
(git for-each-ref
--format='^%(objectname)' \
314 "refs/bisect/good-*" |
tr '\012' ' ') &&
315 eval="git rev-list --bisect-vars $BISECT_OPT $good $bad --" &&
316 eval="$eval $(cat "$GIT_DIR/BISECT_NAMES
")" &&
317 eval=$
(filter_skipped
"$eval" "$skip") &&
320 if [ -z "$bisect_rev" ]; then
321 echo "$bad was both good and bad"
324 if [ "$bisect_rev" = "$bad" ]; then
325 exit_if_skipped_commits
"$bisect_tried"
326 echo "$bisect_rev is first bad commit"
327 git diff-tree
--pretty $bisect_rev
331 # We should exit here only if the "bad"
332 # commit is also a "skip" commit (see above).
333 exit_if_skipped_commits
"$bisect_rev"
335 echo "Bisecting: $bisect_nr revisions left to test after this"
336 git branch
-D new-bisect
2> /dev
/null
337 git checkout
-q -b new-bisect
"$bisect_rev" ||
exit
338 git branch
-M new-bisect bisect
339 git show-branch
"$bisect_rev"
343 bisect_next_check fail
347 case "${DISPLAY+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" in
354 -*) set git log
"$@" ;;
359 not
=$
(git for-each-ref
--format='%(refname)' "refs/bisect/good-*")
360 eval '"$@"' refs
/bisect
/bad
--not $not -- $
(cat "$GIT_DIR/BISECT_NAMES")
364 test -f "$GIT_DIR/BISECT_NAMES" ||
{
365 echo "We are not bisecting."
369 0) if [ -s "$GIT_DIR/BISECT_START" ]; then
370 branch
=`cat "$GIT_DIR/BISECT_START"`
374 1) git show-ref
--verify --quiet -- "refs/heads/$1" ||
375 die
"$1 does not seem to be a valid branch"
380 if git checkout
"$branch"; then
381 # Cleanup head-name if it got left by an old version of git-bisect
382 rm -f "$GIT_DIR/head-name"
383 rm -f "$GIT_DIR/BISECT_START"
388 bisect_clean_state
() {
389 # There may be some refs packed during bisection.
390 git for-each-ref
--format='%(refname) %(objectname)' refs
/bisect
/\
* refs
/heads
/bisect |
393 git update-ref
-d $ref $hash
395 rm -f "$GIT_DIR/BISECT_LOG"
396 rm -f "$GIT_DIR/BISECT_NAMES"
397 rm -f "$GIT_DIR/BISECT_RUN"
401 test -r "$1" || die
"cannot read $1 for replaying"
403 while read bisect
command rev
405 test "$bisect" = "git-bisect" ||
continue
408 cmd
="bisect_start $rev"
411 bisect_write
"$command" "$rev" ;;
413 die
"?? what are you talking about?" ;;
420 bisect_next_check fail
428 # Check for really bad run error.
429 if [ $res -lt 0 -o $res -ge 128 ]; then
430 echo >&2 "bisect run failed:"
431 echo >&2 "exit code $res from '$@' is < 0 or >= 128"
435 # Find current state depending on run success or failure.
436 # A special exit code of 125 means cannot test.
437 if [ $res -eq 125 ]; then
439 elif [ $res -gt 0 ]; then
445 # We have to use a subshell because "bisect_state" can exit.
446 ( bisect_state
$state > "$GIT_DIR/BISECT_RUN" )
449 cat "$GIT_DIR/BISECT_RUN"
451 if grep "first bad commit could be any of" "$GIT_DIR/BISECT_RUN" \
453 echo >&2 "bisect run cannot continue any more"
457 if [ $res -ne 0 ]; then
458 echo >&2 "bisect run failed:"
459 echo >&2 "'bisect_state $state' exited with error code $res"
463 if grep "is first bad commit" "$GIT_DIR/BISECT_RUN" > /dev
/null
; then
464 echo "bisect run success"
484 bisect_state
"$cmd" "$@" ;;
486 # Not sure we want "next" at the UI level anymore.
489 bisect_visualize
"$@" ;;
493 bisect_replay
"$@" ;;
495 cat "$GIT_DIR/BISECT_LOG" ;;