diff options
Diffstat (limited to 'git-bisect.sh')
| -rwxr-xr-x | git-bisect.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/git-bisect.sh b/git-bisect.sh index 936b4a4b83..11313a7949 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -123,7 +123,15 @@ bisect_next_check() { case "$next_ok,$1" in no,) false ;; no,fail) - echo >&2 'You need to give me at least one good and one bad revisions.' + THEN='' + test -d "$GIT_DIR/refs/bisect" || { + echo >&2 'You need to start by "git bisect start".' + THEN='then ' + } + echo >&2 'You '$THEN'need to give me at least one good' \ + 'and one bad revisions.' + echo >&2 '(You can use "git bisect bad" and' \ + '"git bisect good" for that.)' exit 1 ;; *) true ;; @@ -173,7 +181,7 @@ bisect_reset() { else branch=master fi ;; - 1) test -f "$GIT_DIR/refs/heads/$1" || { + 1) git-show-ref --verify --quiet -- "refs/heads/$1" || { echo >&2 "$1 does not seem to be a valid branch" exit 1 } @@ -223,6 +231,8 @@ bisect_replay () { } bisect_run () { + bisect_next_check fail + while true do echo "running $@" |