Merge branch 'lj/mingw-pthread-cond'

diff --git a/t/t9302-fast-import-unpack-limit.sh b/t/t9302-fast-import-unpack-limit.sh
index a04de14677adee98bef418f17c6421eda17a358f..bb1c39cfcc9626dd1de998c50f9126b4a88ccc06 100755 (executable)
--- a/t/t9302-fast-import-unpack-limit.sh
+++ b/t/t9302-fast-import-unpack-limit.sh
@@ -80,7 +80,7 @@ test_expect_success 'lookups after checkpoint works' '
                do
                        if test $n -gt 30
                        then
-                               echo >&2 "checkpoint did not update branch"
+                               echo >&2 "checkpoint did not update branch" &&
                                exit 1
                        else
                                n=$(($n + 1))