aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-26 13:53:45 -0800
committerJunio C Hamano <gitster@pobox.com>2009-12-26 13:59:31 -0800
commit15caa41053c465aeabb1a0d2d3d3c12d701bc62d (patch)
tree5d09c52cdf751eff786ba3f77bc5b4ef2d0eb759
parent902f235378cb2b2f6dd5dd664b9630c95321f0ae (diff)
downloadgit-15caa41053c465aeabb1a0d2d3d3c12d701bc62d.tar.gz
git-15caa41053c465aeabb1a0d2d3d3c12d701bc62d.tar.xz
t1200: work around a bug in some implementations of "find"
"find path ..." command should exit with zero status only when all path operands were traversed successfully. When a non-existent path is given, however, some implementations of "find" (e.g. OpenBSD 4.6) exit with zero status and break the last test in t1200. Rewrite the test to check that there is no regular files in the objects fan-out directories to work around this bug; it is closer to what we are testing anyway. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t1200-tutorial.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index 238c2f1c0..ab55eda15 100755
--- 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