git-prompt: change == to = for zsh's sake

[thirdparty/git.git] / git-bisect.sh

diff --git a/git-bisect.sh b/git-bisect.sh
index efee12b8b1e6d53d3cd5275683ebb0a4198b4b95..08a6ed57ddb115413013ce5cd4c9a786b1a2bef9 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -209,7 +209,8 @@ bisect_replay () {
        test "$#" -eq 1 || die "$(gettext "No logfile given")"
        test -r "$file" || die "$(eval_gettext "cannot read \$file for replaying")"
        git bisect--helper --bisect-reset || exit
-       while read git bisect command rev
+       oIFS="$IFS" IFS="$IFS$(printf '\015')"
+       while read git bisect command rev tail
        do
                test "$git $bisect" = "git bisect" || test "$git" = "git-bisect" || continue
                if test "$git" = "git-bisect"
@@ -222,7 +223,7 @@ bisect_replay () {
                get_terms
                case "$command" in
                start)
-                       cmd="bisect_start $rev"
+                       cmd="bisect_start $rev $tail"
                        eval "$cmd" ;;
                "$TERM_GOOD"|"$TERM_BAD"|skip)
                        git bisect--helper --bisect-write "$command" "$rev" "$TERM_GOOD" "$TERM_BAD" || exit;;
@@ -232,6 +233,7 @@ bisect_replay () {
                        die "$(gettext "?? what are you talking about?")" ;;
                esac
        done <"$file"
+       IFS="$oIFS"
        bisect_auto_next
 }