Fourth batch

diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh
index 79045abb5171691246167a42eec6bf18fbeb0b76..335d3f3211aa874fd3a8e0d0006dd9fc53a4e589 100755 (executable)
--- a/t/t1304-default-acl.sh
+++ b/t/t1304-default-acl.sh
@@ -26,7 +26,7 @@ test_expect_success 'checking for a working acl setup' '
 
 if test -z "$LOGNAME"
 then
-       LOGNAME=$USER
+       LOGNAME="${USER:-$(id -u -n)}"
 fi
 
 check_perms_and_acl () {
@@ -54,7 +54,7 @@ test_expect_success SETFACL 'Setup test repo' '
 
 test_expect_success SETFACL 'Objects creation does not break ACLs with restrictive umask' '
        # SHA1 for empty blob
-       check_perms_and_acl .git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
+       check_perms_and_acl .git/objects/$(echo $EMPTY_BLOB | sed -e "s,^\(..\),\1/,")
 '
 
 test_expect_success SETFACL 'git gc does not break ACLs with restrictive umask' '