diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-19 19:40:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-19 19:40:05 (GMT) |
| commit | 5027acc4db7046f6f0a87c82f16efd507d18d1dc (patch) | |
| tree | 9b69a6da5064b2bd17cd72d2451dd9bcc8e85e1c /t | |
| parent | 67daebfd3b9ba020d677e069000782b9b1e8cf75 (diff) | |
| parent | 098082fb78768dc3cbe659048c9f47cabdd7e39b (diff) | |
| download | git-5027acc4db7046f6f0a87c82f16efd507d18d1dc.zip git-5027acc4db7046f6f0a87c82f16efd507d18d1dc.tar.gz git-5027acc4db7046f6f0a87c82f16efd507d18d1dc.tar.bz2 | |
Merge branch 'jc/maint-shared-literally' into maint
* jc/maint-shared-literally:
Update docs on behaviour of 'core.sharedRepository' and 'git init --shared'
t1301-shared-repo: fix forced modes test
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1301-shared-repo.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh index 3c8a237..3fddc9e 100755 --- a/t/t1301-shared-repo.sh +++ b/t/t1301-shared-repo.sh @@ -141,11 +141,14 @@ test_expect_success 'forced modes' ' git commit -a -m initial && git repack ) && - find new/.git -print | + # List repository files meant to be protected; note that + # COMMIT_EDITMSG does not matter---0mode is not about a + # repository with a work tree. + find new/.git -type f -name COMMIT_EDITMSG -prune -o -print | xargs ls -ld >actual && # Everything must be unaccessible to others - test -z "$(sed -n -e "/^.......---/d" actual)" && + test -z "$(sed -e "/^.......---/d" actual)" && # All directories must have either 2770 or 770 test -z "$(sed -n -e "/^drwxrw[sx]---/d" -e "/^d/p" actual)" && @@ -156,10 +159,11 @@ test_expect_success 'forced modes' ' p }" actual)" && - # All files inside objects must be 0440 + # All files inside objects must be accessible by us test -z "$(sed -n -e "/objects\//{ /^d/d - /^-r--r-----/d + /^-r.-r.----/d + p }" actual)" ' |