summaryrefslogtreecommitdiff
path: root/t/t1304-default-acl.sh
diff options
context:
space:
mode:
authorW. Trevor King <wking@tremily.us>2014-10-17 21:39:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-19 22:47:20 (GMT)
commit7544b2e2da7170be8ccf04e1a3b64409c3d9eeec (patch)
tree63ba8d584218ca5aae9556c52da19990d914dda4 /t/t1304-default-acl.sh
parent76f8611a5fb7e81c1bada0fb190d573a66fc03f6 (diff)
downloadgit-7544b2e2da7170be8ccf04e1a3b64409c3d9eeec.zip
git-7544b2e2da7170be8ccf04e1a3b64409c3d9eeec.tar.gz
git-7544b2e2da7170be8ccf04e1a3b64409c3d9eeec.tar.bz2
t1304: Set LOGNAME even if USER is unset or null
Avoid: # ./t1304-default-acl.sh ok 1 - checking for a working acl setup ok 2 - Setup test repo not ok 3 - Objects creation does not break ACLs with restrictive umask # # # SHA1 for empty blob # check_perms_and_acl .git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 # not ok 4 - git gc does not break ACLs with restrictive umask # # git gc && # check_perms_and_acl .git/objects/pack/*.pack # # failed 2 among 4 test(s) 1..4 on systems where USER isn't set. It's usually set by the login process, but it isn't set when launching some Docker images. For example: $ docker run --rm debian env HOME=/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin HOSTNAME=b2dfdfe797ed 'id -u -n' has been in POSIX from Issue 2 through 2013 [1], so I don't expect compatibility issues. [1]: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/id.html Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1304-default-acl.sh')
-rwxr-xr-xt/t1304-default-acl.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh
index 79045ab..f5422f1 100755
--- 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 () {