diff --git a/t/t7503-pre-commit-hook.sh b/t/t7503-pre-commit-hook.sh index c8097a72d9..d787cac2f7 100755 --- a/t/t7503-pre-commit-hook.sh +++ b/t/t7503-pre-commit-hook.sh @@ -4,15 +4,21 @@ test_description='pre-commit hook' . ./test-lib.sh -test_expect_success "with no hook" \ - "echo 'foo' > file && - git add file && - git commit -m 'first'" +test_expect_success 'with no hook' ' -test_expect_success "--no-verify with no hook" \ - "echo 'bar' > file && - git add file && - git commit --no-verify -m 'bar'" + echo "foo" > file && + git add file && + git commit -m "first" + +' + +test_expect_success '--no-verify with no hook' ' + + echo "bar" > file && + git add file && + git commit --no-verify -m "bar" + +' # now install hook that always succeeds HOOKDIR="$(git rev-parse --git-dir)/hooks" @@ -24,15 +30,21 @@ exit 0 EOF chmod +x "$HOOK" -test_expect_success "with succeeding hook" \ - "echo 'more' >> file && - git add file && - git commit -m 'more'" +test_expect_success 'with succeeding hook' ' -test_expect_success "--no-verify with succeeding hook" \ - "echo 'even more' >> file && - git add file && - git commit --no-verify -m 'even more'" + echo "more" >> file && + git add file && + git commit -m "more" + +' + +test_expect_success '--no-verify with succeeding hook' ' + + echo "even more" >> file && + git add file && + git commit --no-verify -m "even more" + +' # now a hook that fails cat > "$HOOK" < "$HOOK" <> file && - git add file && - git commit -m 'another'" +test_expect_failure 'with failing hook' ' -test_expect_success "--no-verify with failing hook" \ - "echo 'stuff' >> file && - git add file && - git commit --no-verify -m 'stuff'" + echo "another" >> file && + git add file && + git commit -m "another" + +' + +test_expect_success '--no-verify with failing hook' ' + + echo "stuff" >> file && + git add file && + git commit --no-verify -m "stuff" + +' chmod -x "$HOOK" -test_expect_success "with non-executable hook" \ - "echo 'content' >> file && - git add file && - git commit -m 'content'" +test_expect_success 'with non-executable hook' ' -test_expect_success "--no-verify with non-executable hook" \ - "echo 'more content' >> file && - git add file && - git commit --no-verify -m 'more content'" + echo "content" >> file && + git add file && + git commit -m "content" + +' + +test_expect_success '--no-verify with non-executable hook' ' + + echo "more content" >> file && + git add file && + git commit --no-verify -m "more content" + +' test_done