From 80700fde91e4a57897d811aa40daf9251b39c77c Mon Sep 17 00:00:00 2001
From: Brandon Casey <drafnel@gmail.com>
Date: Mon, 15 Mar 2010 12:14:37 -0500
Subject: t/t1304: make a second colon optional in the mask ACL check

Solaris only uses one colon in the listing of the ACL mask, Linux uses two,
so substitute egrep for grep and make the second colon optional.

The -q option for Solaris 7's /usr/xpg4/bin/egrep does not appear to be
implemented, so redirect output to /dev/null.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh
index 85351ae..055ad00 100755
--- a/t/t1304-default-acl.sh
+++ b/t/t1304-default-acl.sh
@@ -25,7 +25,7 @@ check_perms_and_acl () {
 	getfacl "$1" > actual &&
 	grep -q "user:root:rwx" actual &&
 	grep -q "user:${LOGNAME}:rwx" actual &&
-	grep -q "mask::r--" actual &&
+	egrep "mask::?r--" actual > /dev/null 2>&1 &&
 	grep -q "group::---" actual || false
 }
 
-- 
cgit v0.10.2-6-g49f6