Merge branch 'cc/bisect'

[git.git] / git-bisect.sh

diff --git a/git-bisect.sh b/git-bisect.sh
index 414f813be72003c81cbe53eddaa8ab7dc6c2de64..7a6521ec3c62b04fe6d4c3e80c418ccc02b4ec65 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -22,6 +22,7 @@ git bisect log
 git bisect run <cmd>...
         use <cmd>... to automatically bisect.'
 
+OPTIONS_SPEC=
 . git-sh-setup
 require_work_tree
 
@@ -328,6 +329,10 @@ bisect_visualize() {
 }
 
 bisect_reset() {
+       test -f "$GIT_DIR/BISECT_NAMES" || {
+               echo "We are not bisecting."
+               return
+       }
        case "$#" in
        0) if [ -s "$GIT_DIR/head-name" ]; then
               branch=`cat "$GIT_DIR/head-name"`