Merge refs/heads/master from .

diff --git a/git-bisect-script b/git-bisect-script
index 2233b4143b2471c6dbb30d4910ba8bdf7455ec7c..0c5c10750e34f76327df0f57ce26417b18dd8963 100755 (executable)
--- a/git-bisect-script
+++ b/git-bisect-script
@@ -58,7 +58,7 @@ bisect_start() {
 bisect_bad() {
        bisect_autostart
         case "$#" in 0 | 1) ;; *) usage ;; esac
-       rev=$(git-rev-parse --revs-only --verify --default HEAD "$@") || exit
+       rev=$(git-rev-parse --verify --default HEAD "$@") || exit
        echo "$rev" > "$GIT_DIR/refs/bisect/bad"
        bisect_auto_next
 }
@@ -67,7 +67,7 @@ bisect_good() {
        bisect_autostart
         case "$#" in
        0)    revs=$(git-rev-parse --verify HEAD) || exit ;;
-       *)    revs=$(git-rev-parse --revs-only "$@") || exit ;;
+       *)    revs=$(git-rev-parse --revs-only --no-flags "$@") || exit ;;
        esac
        for rev in $revs
        do
@@ -107,8 +107,8 @@ bisect_next() {
        rev=$(eval "git-rev-list --bisect $good $bad") || exit
        nr=$(eval "git-rev-list $rev $good" | wc -l) || exit
        if [ "$nr" -le "1" ]; then
-           echo "$bad is first bad commit"
-           git-diff-tree --pretty $bad
+           echo "$rev is first bad commit"
+           git-diff-tree --pretty $rev
            exit 0
        fi
        echo "Bisecting: $nr revisions left to test after this"