From: Junio C Hamano Date: Fri, 24 Oct 2014 21:59:02 +0000 (-0700) Subject: Merge branch 'wk/t1304-wo-USER' X-Git-Tag: v2.2.0-rc0~20 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bb8caad3814b49316f842a006082e79b4e46125c?hp=7fc311d5ff6ac979aec6670bb2dc6bfc6ba9f0df Merge branch 'wk/t1304-wo-USER' * wk/t1304-wo-USER: t1304: Set LOGNAME even if USER is unset or null --- diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh index 79045abb51..f5422f1d33 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 () {