mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-23 18:05:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

t1301: move modebits() to test-lib-functions.sh

Browse Source 
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>
This commit is contained in:
Christian Couder 2017-06-25 06:34:28 +02:00 committed by Junio C Hamano
parent df801f3f9f
commit 73de1c93ad
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
t/t1301-shared-repo.sh
View File

@ -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" '
@ -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"
'
@ -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"
'
@ -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
'
@ -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
'
@ -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
'
@ -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
'
@ -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
'

5
t/test-lib-functions.sh
View File

@ -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=