summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-10-20 23:40:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-10-20 23:40:21 -0700
commit208f689610e524ce9858f9d28635f7fea51b8d96 (patch)
tree93dead7a7854cf96aaf025e9360536763edf3faf /t
parentworkflows documentation: fix link to git-request-pull[1] (diff)
parentFix testcase failure when extended attributes are in use (diff)
downloadtgif-208f689610e524ce9858f9d28635f7fea51b8d96.tar.xz
Merge branch 'maint'
* maint: Fix testcase failure when extended attributes are in use
Diffstat (limited to 't')
-rwxr-xr-xt/t1301-shared-repo.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh
index 2275caa317..653362ba22 100755
--- a/t/t1301-shared-repo.sh
+++ b/t/t1301-shared-repo.sh
@@ -20,6 +20,10 @@ test_expect_success 'shared = 0400 (faulty permission u-w)' '
test $ret != "0"
'
+modebits () {
+ ls -l "$1" | sed -e 's|^\(..........\).*|\1|'
+}
+
for u in 002 022
do
test_expect_success "shared=1 does not clear bits preset by umask $u" '
@@ -85,8 +89,7 @@ do
rm -f .git/info/refs &&
git update-server-info &&
- actual="$(ls -l .git/info/refs)" &&
- actual=${actual%% *} &&
+ actual="$(modebits .git/info/refs)" &&
test "x$actual" = "x-$y" || {
ls -lt .git/info
false
@@ -98,8 +101,7 @@ do
rm -f .git/info/refs &&
git update-server-info &&
- actual="$(ls -l .git/info/refs)" &&
- actual=${actual%% *} &&
+ actual="$(modebits .git/info/refs)" &&
test "x$actual" = "x-$x" || {
ls -lt .git/info
false