Merge branch 'jc/maint-read-tree-multi' into maint

diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh
index d459854e71e1a5c8f850b7c5ef6d1ae1e1f98df9..3fddc9ee781ba9fb5d189bbc5ec0b900b159723a 100755 (executable)
--- a/t/t1301-shared-repo.sh
+++ b/t/t1301-shared-repo.sh
@@ -141,14 +141,17 @@ 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 2770
-       test -z "$(sed -n -e "/^drwxrws---/d" -e "/^d/p" actual)" &&
+       # All directories must have either 2770 or 770
+       test -z "$(sed -n -e "/^drwxrw[sx]---/d" -e "/^d/p" actual)" &&
 
        # post-update hook must be 0770
        test -z "$(sed -n -e "/post-update/{
@@ -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)"
 '