Skip to content

Commit

Permalink
t1301: move modebits() to test-lib-functions.sh
Browse files Browse the repository at this point in the history
As the modebits() function can be useful outside t1301,
let's move it into test-lib-functions.sh, and while at
it let's rename it test_modebits().

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
chriscool authored and gitster committed Jun 25, 2017
1 parent df801f3 commit 73de1c9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
18 changes: 7 additions & 11 deletions t/t1301-shared-repo.sh
Expand Up @@ -19,10 +19,6 @@ test_expect_success 'shared = 0400 (faulty permission u-w)' '
)
'

modebits () {
ls -l "$1" | sed -e 's|^\(..........\).*|\1|'
}

for u in 002 022
do
test_expect_success POSIXPERM "shared=1 does not clear bits preset by umask $u" '
Expand Down Expand Up @@ -88,7 +84,7 @@ do
rm -f .git/info/refs &&
git update-server-info &&
actual="$(modebits .git/info/refs)" &&
actual="$(test_modebits .git/info/refs)" &&
verbose test "x$actual" = "x-$y"
'
Expand All @@ -98,7 +94,7 @@ do
rm -f .git/info/refs &&
git update-server-info &&
actual="$(modebits .git/info/refs)" &&
actual="$(test_modebits .git/info/refs)" &&
verbose test "x$actual" = "x-$x"
'
Expand All @@ -111,7 +107,7 @@ test_expect_success POSIXPERM 'info/refs respects umask in unshared repo' '
umask 002 &&
git update-server-info &&
echo "-rw-rw-r--" >expect &&
modebits .git/info/refs >actual &&
test_modebits .git/info/refs >actual &&
test_cmp expect actual
'

Expand Down Expand Up @@ -177,7 +173,7 @@ test_expect_success POSIXPERM 'remote init does not use config from cwd' '
umask 0022 &&
git init --bare child.git &&
echo "-rw-r--r--" >expect &&
modebits child.git/config >actual &&
test_modebits child.git/config >actual &&
test_cmp expect actual
'

Expand All @@ -187,7 +183,7 @@ test_expect_success POSIXPERM 're-init respects core.sharedrepository (local)' '
echo whatever >templates/foo &&
git init --template=templates &&
echo "-rw-rw-rw-" >expect &&
modebits .git/foo >actual &&
test_modebits .git/foo >actual &&
test_cmp expect actual
'

Expand All @@ -198,7 +194,7 @@ test_expect_success POSIXPERM 're-init respects core.sharedrepository (remote)'
test_path_is_missing child.git/foo &&
git init --bare --template=../templates child.git &&
echo "-rw-rw-rw-" >expect &&
modebits child.git/foo >actual &&
test_modebits child.git/foo >actual &&
test_cmp expect actual
'

Expand All @@ -209,7 +205,7 @@ test_expect_success POSIXPERM 'template can set core.sharedrepository' '
cp .git/config templates/config &&
git init --bare --template=../templates child.git &&
echo "-rw-rw-rw-" >expect &&
modebits child.git/HEAD >actual &&
test_modebits child.git/HEAD >actual &&
test_cmp expect actual
'

Expand Down
5 changes: 5 additions & 0 deletions t/test-lib-functions.sh
Expand Up @@ -216,6 +216,11 @@ test_chmod () {
git update-index --add "--chmod=$@"
}

# Get the modebits from a file.
test_modebits () {
ls -l "$1" | sed -e 's|^\(..........\).*|\1|'
}

# Unset a configuration variable, but don't fail if it doesn't exist.
test_unconfig () {
config_dir=
Expand Down

0 comments on commit 73de1c9

Please sign in to comment.