merge-octopus: abort if index does not match HEAD

diff --git a/t/test-lib.sh b/t/test-lib.sh
index bd4b02e9dbf9560cf1285bb6607be83964ecc40a..0b47eb6bb299492d31111c94557c216bb3f32c7f 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -907,9 +907,11 @@ yes () {
                y="$*"
        fi
 
-       while echo "$y"
+       i=0
+       while test $i -lt 99
        do
-               :
+               echo "$y"
+               i=$(($i+1))
        done
 }
 
@@ -998,7 +1000,7 @@ test_i18ngrep () {
 test_lazy_prereq PIPE '
        # test whether the filesystem supports FIFOs
        case $(uname -s) in
-       CYGWIN*)
+       CYGWIN*|MINGW*)
                false
                ;;
        *)