mirror of
https://github.com/git/git
synced 2024-10-30 04:01:21 +00:00
b2e5d75d17
When the "ab/various-leak-fixes" topic was merged in [1] only t6021 would fail if the tests were run in the "GIT_TEST_PASSING_SANITIZE_LEAK=check" mode, i.e. to check whether we marked all leak-free tests with "TEST_PASSES_SANITIZE_LEAK=true". Since then we've had various tests starting to pass under SANITIZE=leak. Let's mark those as passing, this is when they started to pass, narrowed down with "git bisect": - t5317-pack-objects-filter-objects.sh: Infaebba436e(list-objects-filter: plug pattern_list leak, 2022-12-01). - t3210-pack-refs.sh, t5613-info-alternate.sh, t7403-submodule-sync.sh: In189e97bc4b(diff: remove parseopts member from struct diff_options, 2022-12-01). - t1408-packed-refs.sh: Inab91f6b7c4(Merge branch 'rs/diff-parseopts', 2022-12-19). - t0023-crlf-am.sh, t4152-am-subjects.sh, t4254-am-corrupt.sh, t4256-am-format-flowed.sh, t4257-am-interactive.sh, t5403-post-checkout-hook.sh: Ina658e881c1(am: don't pass strvec to apply_parse_options(), 2022-12-13) - t1301-shared-repo.sh, t1302-repo-version.sh: Inb07a819c05(reflog: clear leftovers in reflog_expiry_cleanup(), 2022-12-13). - t1304-default-acl.sh, t1410-reflog.sh, t5330-no-lazy-fetch-with-commit-graph.sh, t5502-quickfetch.sh, t5604-clone-reference.sh, t6014-rev-list-all.sh, t7701-repack-unpack-unreachable.sh: Inb0c61be320(Merge branch 'rs/reflog-expiry-cleanup', 2022-12-26) - t3800-mktag.sh, t5302-pack-index.sh, t5306-pack-nobase.sh, t5573-pull-verify-signatures.sh, t7612-merge-verify-signatures.sh: In69bbbe484b(hash-object: use fsck for object checks, 2023-01-18). - t1451-fsck-buffer.sh: In8e4309038f(fsck: do not assume NUL-termination of buffers, 2023-01-19). - t6501-freshen-objects.sh: Inabf2bb895b(Merge branch 'jk/hash-object-fsck', 2023-01-30) 1.9ea1378d04(Merge branch 'ab/various-leak-fixes', 2022-12-14) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
116 lines
3.6 KiB
Bash
Executable file
116 lines
3.6 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2006 Josh England
|
|
#
|
|
|
|
test_description='Test the post-checkout 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 setup '
|
|
test_hook --setup post-checkout <<-\EOF &&
|
|
echo "$@" >.git/post-checkout.args
|
|
EOF
|
|
test_commit one &&
|
|
test_commit two &&
|
|
test_commit rebase-on-me &&
|
|
git reset --hard HEAD^ &&
|
|
test_commit three
|
|
'
|
|
|
|
test_expect_success 'post-checkout receives the right arguments with HEAD unchanged ' '
|
|
test_when_finished "rm -f .git/post-checkout.args" &&
|
|
git checkout main &&
|
|
read old new flag <.git/post-checkout.args &&
|
|
test $old = $new && test $flag = 1
|
|
'
|
|
|
|
test_expect_success 'post-checkout args are correct with git checkout -b ' '
|
|
test_when_finished "rm -f .git/post-checkout.args" &&
|
|
git checkout -b new1 &&
|
|
read old new flag <.git/post-checkout.args &&
|
|
test $old = $new && test $flag = 1
|
|
'
|
|
|
|
test_expect_success 'post-checkout receives the right args with HEAD changed ' '
|
|
test_when_finished "rm -f .git/post-checkout.args" &&
|
|
git checkout two &&
|
|
read old new flag <.git/post-checkout.args &&
|
|
test $old != $new && test $flag = 1
|
|
'
|
|
|
|
test_expect_success 'post-checkout receives the right args when not switching branches ' '
|
|
test_when_finished "rm -f .git/post-checkout.args" &&
|
|
git checkout main -- three.t &&
|
|
read old new flag <.git/post-checkout.args &&
|
|
test $old = $new && test $flag = 0
|
|
'
|
|
|
|
test_rebase () {
|
|
args="$*" &&
|
|
test_expect_success "post-checkout is triggered on rebase $args" '
|
|
test_when_finished "rm -f .git/post-checkout.args" &&
|
|
git checkout -B rebase-test main &&
|
|
rm -f .git/post-checkout.args &&
|
|
git rebase $args rebase-on-me &&
|
|
read old new flag <.git/post-checkout.args &&
|
|
test_cmp_rev main $old &&
|
|
test_cmp_rev rebase-on-me $new &&
|
|
test $flag = 1
|
|
'
|
|
|
|
test_expect_success "post-checkout is triggered on rebase $args with fast-forward" '
|
|
test_when_finished "rm -f .git/post-checkout.args" &&
|
|
git checkout -B ff-rebase-test rebase-on-me^ &&
|
|
rm -f .git/post-checkout.args &&
|
|
git rebase $args rebase-on-me &&
|
|
read old new flag <.git/post-checkout.args &&
|
|
test_cmp_rev rebase-on-me^ $old &&
|
|
test_cmp_rev rebase-on-me $new &&
|
|
test $flag = 1
|
|
'
|
|
|
|
test_expect_success "rebase $args fast-forward branch checkout runs post-checkout hook" '
|
|
test_when_finished "test_might_fail git rebase --abort" &&
|
|
test_when_finished "rm -f .git/post-checkout.args" &&
|
|
git update-ref refs/heads/rebase-fast-forward three &&
|
|
git checkout two &&
|
|
rm -f .git/post-checkout.args &&
|
|
git rebase $args HEAD rebase-fast-forward &&
|
|
read old new flag <.git/post-checkout.args &&
|
|
test_cmp_rev two $old &&
|
|
test_cmp_rev three $new &&
|
|
test $flag = 1
|
|
'
|
|
|
|
test_expect_success "rebase $args checkout does not remove untracked files" '
|
|
test_when_finished "test_might_fail git rebase --abort" &&
|
|
test_when_finished "rm -f .git/post-checkout.args" &&
|
|
git update-ref refs/heads/rebase-fast-forward three &&
|
|
git checkout two &&
|
|
rm -f .git/post-checkout.args &&
|
|
echo untracked >three.t &&
|
|
test_when_finished "rm three.t" &&
|
|
test_must_fail git rebase $args HEAD rebase-fast-forward 2>err &&
|
|
grep "untracked working tree files would be overwritten by checkout" err &&
|
|
test_path_is_missing .git/post-checkout.args
|
|
|
|
'
|
|
}
|
|
|
|
test_rebase --apply &&
|
|
test_rebase --merge
|
|
|
|
test_expect_success 'post-checkout hook is triggered by clone' '
|
|
mkdir -p templates/hooks &&
|
|
write_script templates/hooks/post-checkout <<-\EOF &&
|
|
echo "$@" >"$GIT_DIR/post-checkout.args"
|
|
EOF
|
|
git clone --template=templates . clone3 &&
|
|
test -f clone3/.git/post-checkout.args
|
|
'
|
|
|
|
test_done
|