Merge branch 'maint'

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

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 &&