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 HEAD
) ||
70 head=$
(GIT_DIR
="$GIT_DIR" git rev-parse
--verify HEAD
) ||
71 die
"Bad HEAD - I need a HEAD"
74 if [ -s "$GIT_DIR/BISECT_START" ]; then
75 branch
=`cat "$GIT_DIR/BISECT_START"`
79 git checkout
$branch ||
exit
82 # This error message should only be triggered by cogito usage,
83 # and cogito users should understand it relates to cg-seek.
84 [ -s "$GIT_DIR/head-name" ] && die
"won't bisect on seeked tree"
85 echo "${head#refs/heads/}" >"$GIT_DIR/BISECT_START"
88 die
"Bad HEAD - strange symbolic ref"
93 # Get rid of any old bisect state
98 # Check for one bad and then some good revisions.
102 case "$arg" in --) has_double_dash
=1; break ;; esac
106 while [ $# -gt 0 ]; do
114 rev=$
(git rev-parse
--verify "$arg^{commit}" 2>/dev
/null
) ||
{
115 test $has_double_dash -eq 1 &&
116 die
"'$arg' does not appear to be a valid revision"
120 0) state
='bad' ; bad_seen
=1 ;;
123 bisect_write
"$state" "$rev" 'nolog'
129 sq "$@" >"$GIT_DIR/BISECT_NAMES"
130 echo "git-bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG"
140 good|skip
) tag
="$state"-"$rev" ;;
141 *) die
"Bad bisect_write argument: $state" ;;
143 git update-ref
"refs/bisect/$tag" "$rev"
144 echo "# $state: $(git show-branch $rev)" >>"$GIT_DIR/BISECT_LOG"
145 test -z "$nolog" && echo "git-bisect $state $rev" >>"$GIT_DIR/BISECT_LOG"
153 die
"Please call 'bisect_state' with at least one argument." ;;
155 rev=$
(git rev-parse
--verify HEAD
) ||
156 die
"Bad rev input: HEAD"
157 bisect_write
"$state" "$rev" ;;
159 rev=$
(git rev-parse
--verify "$2^{commit}") ||
160 die
"Bad rev input: $2"
161 bisect_write
"$state" "$rev" ;;
164 revs
=$
(git rev-parse
--revs-only --no-flags "$@") &&
165 test '' != "$revs" || die
"Bad rev input: $@"
168 rev=$
(git rev-parse
--verify "$rev^{commit}") ||
169 die
"Bad rev commit: $rev^{commit}"
170 bisect_write
"$state" "$rev"
178 bisect_next_check
() {
179 missing_good
= missing_bad
=
180 git show-ref
-q --verify refs
/bisect
/bad || missing_bad
=t
181 test -n "$(git for-each-ref "refs
/bisect
/good-
*")" || missing_good
=t
183 case "$missing_good,$missing_bad,$1" in
185 : have both good and bad
- ok
188 # do not have both but not asked to fail - just report.
192 # have bad but not good. we could bisect although
193 # this is less optimum.
194 echo >&2 'Warning: bisecting only with a bad commit.'
197 printf >&2 'Are you sure [Y/n]? '
198 case "$(read yesno)" in [Nn
]*) exit 1 ;; esac
200 : bisect without good...
204 test -f "$GIT_DIR/BISECT_NAMES" ||
{
205 echo >&2 'You need to start by "git bisect start".'
208 echo >&2 'You '$THEN'need to give me at least one good' \
209 'and one bad revisions.'
210 echo >&2 '(You can use "git bisect bad" and' \
211 '"git bisect good" for that.)'
217 bisect_next_check
&& bisect_next ||
:
224 if [ -z "$_skip" ]; then
229 # Let's parse the output of:
230 # "git rev-list --bisect-vars --bisect-all ..."
231 eval $_eval |
while read hash line
233 case "$VARS,$FOUND,$TRIED,$hash" in
234 # We display some vars.
235 1,*,*,*) echo "$hash $line" ;;
240 # We had nothing to search.
246 # We did not find a good bisect rev.
247 # This should happen only if the "bad"
248 # commit is also a "skip" commit.
250 echo "bisect_rev=$TRIED"
256 TRIED
="${TRIED:+$TRIED|}$hash"
260 echo "bisect_rev=$hash"
261 echo "bisect_tried=\"$TRIED\""
267 # We have already found a rev to be tested.
268 ,1,*,bisect_rev
*) VARS
=1 ;;
272 *) die
"filter_skipped error " \
283 exit_if_skipped_commits
() {
285 if expr "$_tried" : ".*[|].*" > /dev
/null
; then
286 echo "There are only 'skip'ped commit left to test."
287 echo "The first bad commit could be any of:"
288 echo "$_tried" |
tr '[|]' '[\012]'
289 echo "We cannot bisect more!"
295 case "$#" in 0) ;; *) usage
;; esac
297 bisect_next_check good
299 skip
=$
(git for-each-ref
--format='%(objectname)' \
300 "refs/bisect/skip-*" |
tr '\012' ' ') ||
exit
303 test -n "$skip" && BISECT_OPT
='--bisect-all'
305 bad
=$
(git rev-parse
--verify refs
/bisect
/bad
) &&
306 good
=$
(git for-each-ref
--format='^%(objectname)' \
307 "refs/bisect/good-*" |
tr '\012' ' ') &&
308 eval="git rev-list --bisect-vars $BISECT_OPT $good $bad --" &&
309 eval="$eval $(cat "$GIT_DIR/BISECT_NAMES
")" &&
310 eval=$
(filter_skipped
"$eval" "$skip") &&
313 if [ -z "$bisect_rev" ]; then
314 echo "$bad was both good and bad"
317 if [ "$bisect_rev" = "$bad" ]; then
318 exit_if_skipped_commits
"$bisect_tried"
319 echo "$bisect_rev is first bad commit"
320 git diff-tree
--pretty $bisect_rev
324 # We should exit here only if the "bad"
325 # commit is also a "skip" commit (see above).
326 exit_if_skipped_commits
"$bisect_rev"
328 echo "Bisecting: $bisect_nr revisions left to test after this"
329 git branch
-f new-bisect
"$bisect_rev"
330 git checkout
-q new-bisect ||
exit
331 git branch
-M new-bisect bisect
332 git show-branch
"$bisect_rev"
336 bisect_next_check fail
340 case "${DISPLAY+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" in
347 -*) set git log
"$@" ;;
352 not
=$
(git for-each-ref
--format='%(refname)' "refs/bisect/good-*")
353 eval '"$@"' refs
/bisect
/bad
--not $not -- $
(cat "$GIT_DIR/BISECT_NAMES")
357 test -f "$GIT_DIR/BISECT_NAMES" ||
{
358 echo "We are not bisecting."
362 0) if [ -s "$GIT_DIR/BISECT_START" ]; then
363 branch
=`cat "$GIT_DIR/BISECT_START"`
367 1) git show-ref
--verify --quiet -- "refs/heads/$1" ||
368 die
"$1 does not seem to be a valid branch"
373 if git checkout
"$branch"; then
374 # Cleanup head-name if it got left by an old version of git-bisect
375 rm -f "$GIT_DIR/head-name"
376 rm -f "$GIT_DIR/BISECT_START"
381 bisect_clean_state
() {
382 # There may be some refs packed during bisection.
383 git for-each-ref
--format='%(refname) %(objectname)' refs
/bisect
/\
* refs
/heads
/bisect |
386 git update-ref
-d $ref $hash
388 rm -f "$GIT_DIR/BISECT_LOG"
389 rm -f "$GIT_DIR/BISECT_NAMES"
390 rm -f "$GIT_DIR/BISECT_RUN"
394 test -r "$1" || die
"cannot read $1 for replaying"
396 while read bisect
command rev
398 test "$bisect" = "git-bisect" ||
continue
401 cmd
="bisect_start $rev"
404 bisect_write
"$command" "$rev" ;;
406 die
"?? what are you talking about?" ;;
413 bisect_next_check fail
421 # Check for really bad run error.
422 if [ $res -lt 0 -o $res -ge 128 ]; then
423 echo >&2 "bisect run failed:"
424 echo >&2 "exit code $res from '$@' is < 0 or >= 128"
428 # Find current state depending on run success or failure.
429 # A special exit code of 125 means cannot test.
430 if [ $res -eq 125 ]; then
432 elif [ $res -gt 0 ]; then
438 # We have to use a subshell because "bisect_state" can exit.
439 ( bisect_state
$state > "$GIT_DIR/BISECT_RUN" )
442 cat "$GIT_DIR/BISECT_RUN"
444 if grep "first bad commit could be any of" "$GIT_DIR/BISECT_RUN" \
446 echo >&2 "bisect run cannot continue any more"
450 if [ $res -ne 0 ]; then
451 echo >&2 "bisect run failed:"
452 echo >&2 "'bisect_state $state' exited with error code $res"
456 if grep "is first bad commit" "$GIT_DIR/BISECT_RUN" > /dev
/null
; then
457 echo "bisect run success"
477 bisect_state
"$cmd" "$@" ;;
479 # Not sure we want "next" at the UI level anymore.
482 bisect_visualize
"$@" ;;
486 bisect_replay
"$@" ;;
488 cat "$GIT_DIR/BISECT_LOG" ;;