diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-12-26 14:15:55 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-12-26 14:15:55 -0800 |
commit | d828fdb8d79b1d06b3015d9a45da24ac3f887484 (patch) | |
tree | 929110458a6ea604f3fefafe432e067993959402 /t/t1200-tutorial.sh | |
parent | 5717b47c59b0d01d9820dd6d4073d7428d9d4c6e (diff) | |
parent | eca4460eeb18b895cb6ca590490073f75fd010a6 (diff) | |
download | git-d828fdb8d79b1d06b3015d9a45da24ac3f887484.tar.gz git-d828fdb8d79b1d06b3015d9a45da24ac3f887484.tar.xz |
Merge branch 'jc/maint-obsd46' into maint
* jc/maint-obsd46:
t4019 "grep" portability fix
t1200: work around a bug in some implementations of "find"
Diffstat (limited to 't/t1200-tutorial.sh')
-rwxr-xr-x | t/t1200-tutorial.sh | 2 |
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 |