mirror of
https://github.com/git/git
synced 2024-08-24 02:11:08 +00:00
![Ævar Arnfjörð Bjarmason](/assets/img/avatar_default.png)
This marks tests that have been leak-free since various recent commits, but which were not marked us such when the memory leak was fixed. These were mostly discovered with the "check" mode added infaececa53f
(test-lib: have the "check" mode for SANITIZE=leak consider leak logs, 2022-07-28). Commits that fixed the last memory leak in these tests. Per narrowing down when they started to pass under SANITIZE=leak with "bisect": - t1022-read-tree-partial-clone.sh:7e2619d8ff
(list_objects_filter_options: plug leak of filter_spec strings, 2022-09-08) - t4053-diff-no-index.sh:07a6f94a6d
(diff-no-index: release prefixed filenames, 2022-09-07) - t6415-merge-dir-to-symlink.sh:bac92b1f39
(Merge branch 'js/ort-clean-up-after-failed-merge', 2022-08-08). - t5554-noop-fetch-negotiator.sh:66eede4a37
(prepare_repo_settings(): plug leak of config values, 2022-09-08) - t2012-checkout-last.sh, t7504-commit-msg-hook.sh, t91{15,46,60}-git-svn-*.sh: The in-flight "pw/rebase-no-reflog-action" series, upon which this is based: https://lore.kernel.org/git/pull.1405.git.1667575142.gitgitgadget@gmail.com/ Let's mark all of these as passing with "TEST_PASSES_SANITIZE_LEAK=true", to have it regression tested, including as part of the "linux-leaks" CI job. Additionally, let's remove the "!SANITIZE_LEAK" prerequisite from tests that now pass, these were marked as failing in: -77e56d55ba
(diff.c: fix a double-free regression ina18d66cefb
, 2022-03-17) -c4d1d52631
(tests: change some 'test $(git) = "x"' to test_cmp, 2022-03-07) These were not spotted with the new "check" mode, but manually, it doesn't cover these sort of prerequisites. There's few enough that we shouldn't bother to automate it. They'll be going away sooner than later. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com>
310 lines
6.7 KiB
Bash
Executable file
310 lines
6.7 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='commit-msg hook'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'with no hook' '
|
|
|
|
echo "foo" > file &&
|
|
git add file &&
|
|
git commit -m "first"
|
|
|
|
'
|
|
|
|
# set up fake editor for interactive editing
|
|
cat > fake-editor <<'EOF'
|
|
#!/bin/sh
|
|
cp FAKE_MSG "$1"
|
|
exit 0
|
|
EOF
|
|
chmod +x fake-editor
|
|
|
|
## Not using test_set_editor here so we can easily ensure the editor variable
|
|
## is only set for the editor tests
|
|
FAKE_EDITOR="$(pwd)/fake-editor"
|
|
export FAKE_EDITOR
|
|
|
|
test_expect_success 'with no hook (editor)' '
|
|
|
|
echo "more foo" >> file &&
|
|
git add file &&
|
|
echo "more foo" > FAKE_MSG &&
|
|
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit
|
|
|
|
'
|
|
|
|
test_expect_success '--no-verify with no hook' '
|
|
|
|
echo "bar" > file &&
|
|
git add file &&
|
|
git commit --no-verify -m "bar"
|
|
|
|
'
|
|
|
|
test_expect_success '--no-verify with no hook (editor)' '
|
|
|
|
echo "more bar" > file &&
|
|
git add file &&
|
|
echo "more bar" > FAKE_MSG &&
|
|
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
|
|
|
|
'
|
|
|
|
test_expect_success 'setup: commit-msg hook that always succeeds' '
|
|
test_hook --setup commit-msg <<-\EOF
|
|
exit 0
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'with succeeding hook' '
|
|
|
|
echo "more" >> file &&
|
|
git add file &&
|
|
git commit -m "more"
|
|
|
|
'
|
|
|
|
test_expect_success 'with succeeding hook (editor)' '
|
|
|
|
echo "more more" >> file &&
|
|
git add file &&
|
|
echo "more more" > FAKE_MSG &&
|
|
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit
|
|
|
|
'
|
|
|
|
test_expect_success '--no-verify with succeeding hook' '
|
|
|
|
echo "even more" >> file &&
|
|
git add file &&
|
|
git commit --no-verify -m "even more"
|
|
|
|
'
|
|
|
|
test_expect_success '--no-verify with succeeding hook (editor)' '
|
|
|
|
echo "even more more" >> file &&
|
|
git add file &&
|
|
echo "even more more" > FAKE_MSG &&
|
|
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
|
|
|
|
'
|
|
|
|
test_expect_success 'setup: commit-msg hook that always fails' '
|
|
test_hook --clobber commit-msg <<-\EOF
|
|
exit 1
|
|
EOF
|
|
'
|
|
|
|
commit_msg_is () {
|
|
test "$(git log --pretty=format:%s%b -1)" = "$1"
|
|
}
|
|
|
|
test_expect_success 'with failing hook' '
|
|
|
|
echo "another" >> file &&
|
|
git add file &&
|
|
test_must_fail git commit -m "another"
|
|
|
|
'
|
|
|
|
test_expect_success 'with failing hook (editor)' '
|
|
|
|
echo "more another" >> file &&
|
|
git add file &&
|
|
echo "more another" > FAKE_MSG &&
|
|
! (GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit)
|
|
|
|
'
|
|
|
|
test_expect_success '--no-verify with failing hook' '
|
|
|
|
echo "stuff" >> file &&
|
|
git add file &&
|
|
git commit --no-verify -m "stuff"
|
|
|
|
'
|
|
|
|
test_expect_success '-n followed by --verify with failing hook' '
|
|
|
|
echo "even more" >> file &&
|
|
git add file &&
|
|
test_must_fail git commit -n --verify -m "even more"
|
|
|
|
'
|
|
|
|
test_expect_success '--no-verify with failing hook (editor)' '
|
|
|
|
echo "more stuff" >> file &&
|
|
git add file &&
|
|
echo "more stuff" > FAKE_MSG &&
|
|
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
|
|
|
|
'
|
|
|
|
test_expect_success 'merge fails with failing hook' '
|
|
|
|
test_when_finished "git branch -D newbranch" &&
|
|
test_when_finished "git checkout -f main" &&
|
|
git checkout --orphan newbranch &&
|
|
: >file2 &&
|
|
git add file2 &&
|
|
git commit --no-verify file2 -m in-side-branch &&
|
|
test_must_fail git merge --allow-unrelated-histories main &&
|
|
commit_msg_is "in-side-branch" # HEAD before merge
|
|
|
|
'
|
|
|
|
test_expect_success 'merge bypasses failing hook with --no-verify' '
|
|
|
|
test_when_finished "git branch -D newbranch" &&
|
|
test_when_finished "git checkout -f main" &&
|
|
git checkout --orphan newbranch &&
|
|
git rm -f file &&
|
|
: >file2 &&
|
|
git add file2 &&
|
|
git commit --no-verify file2 -m in-side-branch &&
|
|
git merge --no-verify --allow-unrelated-histories main &&
|
|
commit_msg_is "Merge branch '\''main'\'' into newbranch"
|
|
'
|
|
|
|
test_expect_success 'setup: commit-msg hook made non-executable' '
|
|
git_dir="$(git rev-parse --git-dir)" &&
|
|
chmod -x "$git_dir/hooks/commit-msg"
|
|
'
|
|
|
|
|
|
test_expect_success POSIXPERM 'with non-executable hook' '
|
|
|
|
echo "content" >file &&
|
|
git add file &&
|
|
git commit -m "content"
|
|
|
|
'
|
|
|
|
test_expect_success POSIXPERM 'with non-executable hook (editor)' '
|
|
|
|
echo "content again" >> file &&
|
|
git add file &&
|
|
echo "content again" > FAKE_MSG &&
|
|
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -m "content again"
|
|
|
|
'
|
|
|
|
test_expect_success POSIXPERM '--no-verify with non-executable hook' '
|
|
|
|
echo "more content" >> file &&
|
|
git add file &&
|
|
git commit --no-verify -m "more content"
|
|
|
|
'
|
|
|
|
test_expect_success POSIXPERM '--no-verify with non-executable hook (editor)' '
|
|
|
|
echo "even more content" >> file &&
|
|
git add file &&
|
|
echo "even more content" > FAKE_MSG &&
|
|
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
|
|
|
|
'
|
|
|
|
test_expect_success 'setup: commit-msg hook that edits the commit message' '
|
|
test_hook --clobber commit-msg <<-\EOF
|
|
echo "new message" >"$1"
|
|
exit 0
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'hook edits commit message' '
|
|
|
|
echo "additional" >> file &&
|
|
git add file &&
|
|
git commit -m "additional" &&
|
|
commit_msg_is "new message"
|
|
|
|
'
|
|
|
|
test_expect_success 'hook edits commit message (editor)' '
|
|
|
|
echo "additional content" >> file &&
|
|
git add file &&
|
|
echo "additional content" > FAKE_MSG &&
|
|
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit &&
|
|
commit_msg_is "new message"
|
|
|
|
'
|
|
|
|
test_expect_success "hook doesn't edit commit message" '
|
|
|
|
echo "plus" >> file &&
|
|
git add file &&
|
|
git commit --no-verify -m "plus" &&
|
|
commit_msg_is "plus"
|
|
|
|
'
|
|
|
|
test_expect_success "hook doesn't edit commit message (editor)" '
|
|
|
|
echo "more plus" >> file &&
|
|
git add file &&
|
|
echo "more plus" > FAKE_MSG &&
|
|
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify &&
|
|
commit_msg_is "more plus"
|
|
'
|
|
|
|
test_expect_success 'hook called in git-merge picks up commit message' '
|
|
test_when_finished "git branch -D newbranch" &&
|
|
test_when_finished "git checkout -f main" &&
|
|
git checkout --orphan newbranch &&
|
|
git rm -f file &&
|
|
: >file2 &&
|
|
git add file2 &&
|
|
git commit --no-verify file2 -m in-side-branch &&
|
|
git merge --allow-unrelated-histories main &&
|
|
commit_msg_is "new message"
|
|
'
|
|
|
|
test_expect_failure 'merge --continue remembers --no-verify' '
|
|
test_when_finished "git branch -D newbranch" &&
|
|
test_when_finished "git checkout -f main" &&
|
|
git checkout main &&
|
|
echo a >file2 &&
|
|
git add file2 &&
|
|
git commit --no-verify -m "add file2 to main" &&
|
|
git checkout -b newbranch main^ &&
|
|
echo b >file2 &&
|
|
git add file2 &&
|
|
git commit --no-verify file2 -m in-side-branch &&
|
|
git merge --no-verify -m not-rewritten-by-hook main &&
|
|
# resolve conflict:
|
|
echo c >file2 &&
|
|
git add file2 &&
|
|
git merge --continue &&
|
|
commit_msg_is not-rewritten-by-hook
|
|
'
|
|
|
|
# set up fake editor to replace `pick` by `reword`
|
|
cat > reword-editor <<'EOF'
|
|
#!/bin/sh
|
|
mv "$1" "$1".bup &&
|
|
sed 's/^pick/reword/' <"$1".bup >"$1"
|
|
EOF
|
|
chmod +x reword-editor
|
|
REWORD_EDITOR="$(pwd)/reword-editor"
|
|
export REWORD_EDITOR
|
|
|
|
test_expect_success 'hook is called for reword during `rebase -i`' '
|
|
|
|
GIT_SEQUENCE_EDITOR="\"$REWORD_EDITOR\"" git rebase -i HEAD^ &&
|
|
commit_msg_is "new message"
|
|
|
|
'
|
|
|
|
|
|
test_done
|