Merge branch 'master' of git://github.com/git-l10n/git-po

diff --git a/t/t3305-notes-fanout.sh b/t/t3305-notes-fanout.sh
index b1ea64b2130354b1305e752923595128782bc880..54460beec469c0d3fe5db57508b6b762fd540cf2 100755 (executable)
--- a/t/t3305-notes-fanout.sh
+++ b/t/t3305-notes-fanout.sh
@@ -51,15 +51,12 @@ test_expect_success 'deleting most notes with git-notes' '
        num_notes=250 &&
        i=0 &&
        git rev-list HEAD |
-       while read sha1
+       while test $i -lt $num_notes && read sha1
        do
                i=$(($i + 1)) &&
-               if test $i -gt $num_notes
-               then
-                       break
-               fi &&
                test_tick &&
-               git notes remove "$sha1"
+               git notes remove "$sha1" ||
+               exit 1
        done
 '