undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t1301: use modern test_* helpers

Browse Source 
This shortens the code and fixes some &&-chaining.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2015-03-20 06:13:11 -04:00 committed by Junio C Hamano
parent 9157c5cb09
commit 95508a0751
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,12 +12,11 @@ setfacl -k . 2>/dev/null
# User must have read permissions to the repo -> failure on --shared=0400 # User must have read permissions to the repo -> failure on --shared=0400
test_expect_success 'shared = 0400 (faulty permission u-w)' ' test_expect_success 'shared = 0400 (faulty permission u-w)' '
test_when_finished "rm -rf sub" &&
mkdir sub && ( mkdir sub && (
cd sub && git init --shared=0400 cd sub &&
test_must_fail git init --shared=0400
) )
ret="$?"
rm -rf sub
test $ret != "0"
' '
modebits () { modebits () {
@ -33,7 +32,7 @@ do
git init --shared=1 && git init --shared=1 &&
test 1 = "$(git config core.sharedrepository)" test 1 = "$(git config core.sharedrepository)"
) && ) &&
actual=$(ls -l sub/.git/HEAD) actual=$(ls -l sub/.git/HEAD) &&
case "$actual" in case "$actual" in
-rw-rw-r--*) -rw-rw-r--*)
: happy : happy
@ -90,10 +89,8 @@ do
rm -f .git/info/refs && rm -f .git/info/refs &&
git update-server-info && git update-server-info &&
actual="$(modebits .git/info/refs)" && actual="$(modebits .git/info/refs)" &&
test "x$actual" = "x-$y" || { verbose test "x$actual" = "x-$y"
ls -lt .git/info
false
}
' '
umask 077 && umask 077 &&
@ -102,10 +99,7 @@ do
rm -f .git/info/refs && rm -f .git/info/refs &&
git update-server-info && git update-server-info &&
actual="$(modebits .git/info/refs)" && actual="$(modebits .git/info/refs)" &&
test "x$actual" = "x-$x" || { verbose test "x$actual" = "x-$x"
ls -lt .git/info
false
}
' '