diff options
| author | Jeff King <peff@peff.net> | 2015-03-20 06:13:11 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-20 11:35:56 -0700 |
| commit | 95508a075181397ae1040e75116a42af89dc0155 (patch) | |
| tree | cc58b6349bd711b4daf36ba4e9343c77b5eeda2a | |
| parent | 9157c5cb0968f1d97bf4a79b8622a9601387a368 (diff) | |
| download | git-95508a075181397ae1040e75116a42af89dc0155.tar.gz | |
t1301: use modern test_* helpers
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>
| -rwxr-xr-x | t/t1301-shared-repo.sh | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh index 7eecfb836a..ac10875408 100755 --- a/t/t1301-shared-repo.sh +++ b/t/t1301-shared-repo.sh @@ -12,12 +12,11 @@ setfacl -k . 2>/dev/null # User must have read permissions to the repo -> failure on --shared=0400 test_expect_success 'shared = 0400 (faulty permission u-w)' ' + test_when_finished "rm -rf 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 () { @@ -33,7 +32,7 @@ do git init --shared=1 && test 1 = "$(git config core.sharedrepository)" ) && - actual=$(ls -l sub/.git/HEAD) + actual=$(ls -l sub/.git/HEAD) && case "$actual" in -rw-rw-r--*) : happy @@ -90,10 +89,8 @@ do rm -f .git/info/refs && git update-server-info && actual="$(modebits .git/info/refs)" && - test "x$actual" = "x-$y" || { - ls -lt .git/info - false - } + verbose test "x$actual" = "x-$y" + ' umask 077 && @@ -102,10 +99,7 @@ do rm -f .git/info/refs && git update-server-info && actual="$(modebits .git/info/refs)" && - test "x$actual" = "x-$x" || { - ls -lt .git/info - false - } + verbose test "x$actual" = "x-$x" ' |