Merge branch 'maint'

* maint:
  Fix testcase failure when extended attributes are in use
This commit is contained in:
Junio C Hamano
2008-10-20 23:40:21 -07:00

View File

@ -20,6 +20,10 @@ test_expect_success 'shared = 0400 (faulty permission u-w)' '
test $ret != "0" test $ret != "0"
' '
modebits () {
ls -l "$1" | sed -e 's|^\(..........\).*|\1|'
}
for u in 002 022 for u in 002 022
do do
test_expect_success "shared=1 does not clear bits preset by umask $u" ' test_expect_success "shared=1 does not clear bits preset by umask $u" '
@ -85,8 +89,7 @@ do
rm -f .git/info/refs && rm -f .git/info/refs &&
git update-server-info && git update-server-info &&
actual="$(ls -l .git/info/refs)" && actual="$(modebits .git/info/refs)" &&
actual=${actual%% *} &&
test "x$actual" = "x-$y" || { test "x$actual" = "x-$y" || {
ls -lt .git/info ls -lt .git/info
false false
@ -98,8 +101,7 @@ do
rm -f .git/info/refs && rm -f .git/info/refs &&
git update-server-info && git update-server-info &&
actual="$(ls -l .git/info/refs)" && actual="$(modebits .git/info/refs)" &&
actual=${actual%% *} &&
test "x$actual" = "x-$x" || { test "x$actual" = "x-$x" || {
ls -lt .git/info ls -lt .git/info
false false