From: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Date: Fri, 14 Oct 2011 17:44:45 +0000 (+0200)
Subject: t1304: fall back to $USER if $LOGNAME is not defined
X-Git-Tag: v1.7.7.1~24
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ac2604cf5fb9fcf538289a470ecbe345f7f0c220;p=git.git

t1304: fall back to $USER if $LOGNAME is not defined

For some reason $LOGNAME is not set anymore for me after an upgrade from
Ubuntu 11.04 to 11.10.  Use $USER in such a case.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh
index b5d89a225..2b962cfda 100755
--- a/t/t1304-default-acl.sh
+++ b/t/t1304-default-acl.sh
@@ -25,6 +25,11 @@ else
 	test_set_prereq SETFACL
 fi
 
+if test -z "$LOGNAME"
+then
+	LOGNAME=$USER
+fi
+
 check_perms_and_acl () {
 	test -r "$1" &&
 	getfacl "$1" > actual &&