mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
![Ævar Arnfjörð Bjarmason](/assets/img/avatar_default.png)
Extend the "test_hook" function to take options to disable and remove hooks. Using the wrapper instead of getting the path and running "chmod -x" or "rm" will make it easier to eventually emulate the same behavior with config-based hooks. Not all of these tests need that new mode, but since the rest are either closely related or use the same "$HOOK" pattern let's convert them too. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
283 lines
7.1 KiB
Bash
Executable file
283 lines
7.1 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='pre-commit and pre-merge-commit hooks'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'root commit' '
|
|
echo "root" >file &&
|
|
git add file &&
|
|
git commit -m "zeroth" &&
|
|
git checkout -b side &&
|
|
echo "foo" >foo &&
|
|
git add foo &&
|
|
git commit -m "make it non-ff" &&
|
|
git branch side-orig side &&
|
|
git checkout main
|
|
'
|
|
|
|
test_expect_success 'setup conflicting branches' '
|
|
test_when_finished "git checkout main" &&
|
|
git checkout -b conflicting-a main &&
|
|
echo a >conflicting &&
|
|
git add conflicting &&
|
|
git commit -m conflicting-a &&
|
|
git checkout -b conflicting-b main &&
|
|
echo b >conflicting &&
|
|
git add conflicting &&
|
|
git commit -m conflicting-b
|
|
'
|
|
|
|
test_expect_success 'with no hook' '
|
|
test_when_finished "rm -f actual_hooks" &&
|
|
echo "foo" >file &&
|
|
git add file &&
|
|
git commit -m "first" &&
|
|
test_path_is_missing actual_hooks
|
|
'
|
|
|
|
test_expect_success 'with no hook (merge)' '
|
|
test_when_finished "rm -f actual_hooks" &&
|
|
git branch -f side side-orig &&
|
|
git checkout side &&
|
|
git merge -m "merge main" main &&
|
|
git checkout main &&
|
|
test_path_is_missing actual_hooks
|
|
'
|
|
|
|
test_expect_success '--no-verify with no hook' '
|
|
test_when_finished "rm -f actual_hooks" &&
|
|
echo "bar" >file &&
|
|
git add file &&
|
|
git commit --no-verify -m "bar" &&
|
|
test_path_is_missing actual_hooks
|
|
'
|
|
|
|
test_expect_success '--no-verify with no hook (merge)' '
|
|
test_when_finished "rm -f actual_hooks" &&
|
|
git branch -f side side-orig &&
|
|
git checkout side &&
|
|
git merge --no-verify -m "merge main" main &&
|
|
git checkout main &&
|
|
test_path_is_missing actual_hooks
|
|
'
|
|
|
|
setup_success_hook () {
|
|
test_when_finished "rm -f actual_hooks expected_hooks" &&
|
|
echo "$1" >expected_hooks &&
|
|
test_hook "$1" <<-EOF
|
|
echo $1 >>actual_hooks
|
|
EOF
|
|
}
|
|
|
|
test_expect_success 'with succeeding hook' '
|
|
setup_success_hook "pre-commit" &&
|
|
echo "more" >>file &&
|
|
git add file &&
|
|
git commit -m "more" &&
|
|
test_cmp expected_hooks actual_hooks
|
|
'
|
|
|
|
test_expect_success 'with succeeding hook (merge)' '
|
|
setup_success_hook "pre-merge-commit" &&
|
|
git checkout side &&
|
|
git merge -m "merge main" main &&
|
|
git checkout main &&
|
|
test_cmp expected_hooks actual_hooks
|
|
'
|
|
|
|
test_expect_success 'automatic merge fails; both hooks are available' '
|
|
setup_success_hook "pre-commit" &&
|
|
setup_success_hook "pre-merge-commit" &&
|
|
|
|
git checkout conflicting-a &&
|
|
test_must_fail git merge -m "merge conflicting-b" conflicting-b &&
|
|
test_path_is_missing actual_hooks &&
|
|
|
|
echo "pre-commit" >expected_hooks &&
|
|
echo a+b >conflicting &&
|
|
git add conflicting &&
|
|
git commit -m "resolve conflict" &&
|
|
test_cmp expected_hooks actual_hooks
|
|
'
|
|
|
|
test_expect_success '--no-verify with succeeding hook' '
|
|
setup_success_hook "pre-commit" &&
|
|
echo "even more" >>file &&
|
|
git add file &&
|
|
git commit --no-verify -m "even more" &&
|
|
test_path_is_missing actual_hooks
|
|
'
|
|
|
|
test_expect_success '--no-verify with succeeding hook (merge)' '
|
|
setup_success_hook "pre-merge-commit" &&
|
|
git branch -f side side-orig &&
|
|
git checkout side &&
|
|
git merge --no-verify -m "merge main" main &&
|
|
git checkout main &&
|
|
test_path_is_missing actual_hooks
|
|
'
|
|
|
|
setup_failing_hook () {
|
|
test_when_finished "rm -f actual_hooks" &&
|
|
test_hook "$1" <<-EOF
|
|
echo $1-failing-hook >>actual_hooks
|
|
exit 1
|
|
EOF
|
|
}
|
|
|
|
test_expect_success 'with failing hook' '
|
|
setup_failing_hook "pre-commit" &&
|
|
test_when_finished "rm -f expected_hooks" &&
|
|
echo "pre-commit-failing-hook" >expected_hooks &&
|
|
|
|
echo "another" >>file &&
|
|
git add file &&
|
|
test_must_fail git commit -m "another" &&
|
|
test_cmp expected_hooks actual_hooks
|
|
'
|
|
|
|
test_expect_success '--no-verify with failing hook' '
|
|
setup_failing_hook "pre-commit" &&
|
|
echo "stuff" >>file &&
|
|
git add file &&
|
|
git commit --no-verify -m "stuff" &&
|
|
test_path_is_missing actual_hooks
|
|
'
|
|
|
|
test_expect_success 'with failing hook (merge)' '
|
|
setup_failing_hook "pre-merge-commit" &&
|
|
echo "pre-merge-commit-failing-hook" >expected_hooks &&
|
|
git checkout side &&
|
|
test_must_fail git merge -m "merge main" main &&
|
|
git checkout main &&
|
|
test_cmp expected_hooks actual_hooks
|
|
'
|
|
|
|
test_expect_success '--no-verify with failing hook (merge)' '
|
|
setup_failing_hook "pre-merge-commit" &&
|
|
|
|
git branch -f side side-orig &&
|
|
git checkout side &&
|
|
git merge --no-verify -m "merge main" main &&
|
|
git checkout main &&
|
|
test_path_is_missing actual_hooks
|
|
'
|
|
|
|
setup_non_exec_hook () {
|
|
test_when_finished "rm -f actual_hooks" &&
|
|
test_hook "$1" <<-\EOF &&
|
|
echo non-exec >>actual_hooks
|
|
exit 1
|
|
EOF
|
|
test_hook --disable "$1"
|
|
}
|
|
|
|
|
|
test_expect_success POSIXPERM 'with non-executable hook' '
|
|
setup_non_exec_hook "pre-commit" &&
|
|
echo "content" >>file &&
|
|
git add file &&
|
|
git commit -m "content" &&
|
|
test_path_is_missing actual_hooks
|
|
'
|
|
|
|
test_expect_success POSIXPERM '--no-verify with non-executable hook' '
|
|
setup_non_exec_hook "pre-commit" &&
|
|
echo "more content" >>file &&
|
|
git add file &&
|
|
git commit --no-verify -m "more content" &&
|
|
test_path_is_missing actual_hooks
|
|
'
|
|
|
|
test_expect_success POSIXPERM 'with non-executable hook (merge)' '
|
|
setup_non_exec_hook "pre-merge" &&
|
|
git branch -f side side-orig &&
|
|
git checkout side &&
|
|
git merge -m "merge main" main &&
|
|
git checkout main &&
|
|
test_path_is_missing actual_hooks
|
|
'
|
|
|
|
test_expect_success POSIXPERM '--no-verify with non-executable hook (merge)' '
|
|
setup_non_exec_hook "pre-merge" &&
|
|
git branch -f side side-orig &&
|
|
git checkout side &&
|
|
git merge --no-verify -m "merge main" main &&
|
|
git checkout main &&
|
|
test_path_is_missing actual_hooks
|
|
'
|
|
|
|
setup_require_prefix_hook () {
|
|
test_when_finished "rm -f expected_hooks" &&
|
|
echo require-prefix >expected_hooks &&
|
|
test_hook pre-commit <<-\EOF
|
|
echo require-prefix >>actual_hooks
|
|
test $GIT_PREFIX = "success/"
|
|
EOF
|
|
}
|
|
|
|
test_expect_success 'with hook requiring GIT_PREFIX' '
|
|
test_when_finished "rm -rf actual_hooks success" &&
|
|
setup_require_prefix_hook &&
|
|
echo "more content" >>file &&
|
|
git add file &&
|
|
mkdir success &&
|
|
(
|
|
cd success &&
|
|
git commit -m "hook requires GIT_PREFIX = success/"
|
|
) &&
|
|
test_cmp expected_hooks actual_hooks
|
|
'
|
|
|
|
test_expect_success 'with failing hook requiring GIT_PREFIX' '
|
|
test_when_finished "rm -rf actual_hooks fail" &&
|
|
setup_require_prefix_hook &&
|
|
echo "more content" >>file &&
|
|
git add file &&
|
|
mkdir fail &&
|
|
(
|
|
cd fail &&
|
|
test_must_fail git commit -m "hook must fail"
|
|
) &&
|
|
git checkout -- file &&
|
|
test_cmp expected_hooks actual_hooks
|
|
'
|
|
|
|
setup_require_author_hook () {
|
|
test_when_finished "rm -f expected_hooks actual_hooks" &&
|
|
echo check-author >expected_hooks &&
|
|
test_hook pre-commit <<-\EOF
|
|
echo check-author >>actual_hooks
|
|
test "$GIT_AUTHOR_NAME" = "New Author" &&
|
|
test "$GIT_AUTHOR_EMAIL" = "newauthor@example.com"
|
|
EOF
|
|
}
|
|
|
|
|
|
test_expect_success 'check the author in hook' '
|
|
setup_require_author_hook &&
|
|
cat >expected_hooks <<-EOF &&
|
|
check-author
|
|
check-author
|
|
check-author
|
|
EOF
|
|
test_must_fail git commit --allow-empty -m "by a.u.thor" &&
|
|
(
|
|
GIT_AUTHOR_NAME="New Author" &&
|
|
GIT_AUTHOR_EMAIL="newauthor@example.com" &&
|
|
export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
|
|
git commit --allow-empty -m "by new.author via env" &&
|
|
git show -s
|
|
) &&
|
|
git commit --author="New Author <newauthor@example.com>" \
|
|
--allow-empty -m "by new.author via command line" &&
|
|
git show -s &&
|
|
test_cmp expected_hooks actual_hooks
|
|
'
|
|
|
|
test_done
|