aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-24 14:59:02 -0700
committerJunio C Hamano <gitster@pobox.com>2014-10-24 14:59:02 -0700
commitbb8caad3814b49316f842a006082e79b4e46125c (patch)
tree1ec855ef193da60245a1d680e259d9413ebc888e
parent7fc311d5ff6ac979aec6670bb2dc6bfc6ba9f0df (diff)
parent7544b2e2da7170be8ccf04e1a3b64409c3d9eeec (diff)
downloadgit-bb8caad3814b49316f842a006082e79b4e46125c.tar.gz
git-bb8caad3814b49316f842a006082e79b4e46125c.tar.xz
Merge branch 'wk/t1304-wo-USER'
* wk/t1304-wo-USER: t1304: Set LOGNAME even if USER is unset or null
-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 79045abb5..f5422f1d3 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 () {