Merge branch 'cc/cherry-pick-series'

diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index 238c2f1c08d0c27b71cdde8c7ddc2b3240ea1fde..ab55eda158bb5a6ecad77302aa2fe17bd6e92be3 100755 (executable)
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
@@ -259,7 +259,7 @@ test_expect_success 'git repack' 'git repack'
 test_expect_success 'git prune-packed' 'git prune-packed'
 test_expect_success '-> only packed objects' '
        git prune && # Remove conflict marked blobs
-       ! find .git/objects/[0-9a-f][0-9a-f] -type f
+       test $(find .git/objects/[0-9a-f][0-9a-f] -type f -print 2>/dev/null | wc -l) = 0
 '
 
 test_done