2007-09-26 21:31:01 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2006 Josh England
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='Test the post-checkout hook.'
|
2020-11-18 23:44:29 +00:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-18 23:44:19 +00:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
tests: mark tests as passing with SANITIZE=leak
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: In
faebba436e6 (list-objects-filter: plug pattern_list leak, 2022-12-01).
- t3210-pack-refs.sh, t5613-info-alternate.sh,
t7403-submodule-sync.sh: In 189e97bc4ba (diff: remove parseopts member
from struct diff_options, 2022-12-01).
- t1408-packed-refs.sh: In ab91f6b7c42 (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: In a658e881c13 (am: don't pass strvec to
apply_parse_options(), 2022-12-13)
- t1301-shared-repo.sh, t1302-repo-version.sh: In b07a819c05f (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: In b0c61be3209 (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: In
69bbbe484ba (hash-object: use fsck for object checks, 2023-01-18).
- t1451-fsck-buffer.sh: In 8e4309038f0 (fsck: do not assume
NUL-termination of buffers, 2023-01-19).
- t6501-freshen-objects.sh: In abf2bb895b4 (Merge branch
'jk/hash-object-fsck', 2023-01-30)
1. 9ea1378d046 (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>
2023-02-06 23:07:36 +00:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2007-09-26 21:31:01 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success setup '
|
2022-03-17 10:13:14 +00:00
|
|
|
test_hook --setup post-checkout <<-\EOF &&
|
2018-12-29 21:37:58 +00:00
|
|
|
echo "$@" >.git/post-checkout.args
|
|
|
|
EOF
|
|
|
|
test_commit one &&
|
|
|
|
test_commit two &&
|
2018-12-29 21:37:59 +00:00
|
|
|
test_commit rebase-on-me &&
|
|
|
|
git reset --hard HEAD^ &&
|
2018-12-29 21:37:58 +00:00
|
|
|
test_commit three
|
2007-09-26 21:31:01 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'post-checkout receives the right arguments with HEAD unchanged ' '
|
2018-12-29 21:37:58 +00:00
|
|
|
test_when_finished "rm -f .git/post-checkout.args" &&
|
2020-11-18 23:44:29 +00:00
|
|
|
git checkout main &&
|
2018-12-29 21:37:58 +00:00
|
|
|
read old new flag <.git/post-checkout.args &&
|
2014-06-06 14:55:59 +00:00
|
|
|
test $old = $new && test $flag = 1
|
2007-09-26 21:31:01 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'post-checkout args are correct with git checkout -b ' '
|
2018-12-29 21:37:58 +00:00
|
|
|
test_when_finished "rm -f .git/post-checkout.args" &&
|
|
|
|
git checkout -b new1 &&
|
|
|
|
read old new flag <.git/post-checkout.args &&
|
2014-06-06 14:55:59 +00:00
|
|
|
test $old = $new && test $flag = 1
|
2007-09-26 21:31:01 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'post-checkout receives the right args with HEAD changed ' '
|
2018-12-29 21:37:58 +00:00
|
|
|
test_when_finished "rm -f .git/post-checkout.args" &&
|
|
|
|
git checkout two &&
|
|
|
|
read old new flag <.git/post-checkout.args &&
|
2014-06-06 14:55:59 +00:00
|
|
|
test $old != $new && test $flag = 1
|
2007-09-26 21:31:01 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'post-checkout receives the right args when not switching branches ' '
|
2018-12-29 21:37:58 +00:00
|
|
|
test_when_finished "rm -f .git/post-checkout.args" &&
|
2020-11-18 23:44:29 +00:00
|
|
|
git checkout main -- three.t &&
|
2018-12-29 21:37:58 +00:00
|
|
|
read old new flag <.git/post-checkout.args &&
|
2014-06-06 14:55:59 +00:00
|
|
|
test $old = $new && test $flag = 0
|
2007-09-26 21:31:01 +00:00
|
|
|
'
|
|
|
|
|
2022-01-26 13:05:37 +00:00
|
|
|
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
|
|
|
|
'
|
2018-12-29 21:37:59 +00:00
|
|
|
|
2022-01-26 13:05:37 +00:00
|
|
|
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
|
|
|
|
'
|
2022-01-26 13:05:38 +00:00
|
|
|
|
|
|
|
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
|
|
|
|
'
|
2022-01-26 13:05:39 +00:00
|
|
|
|
|
|
|
test_expect_success "rebase $args checkout does not remove untracked files" '
|
|
|
|
test_when_finished "test_might_fail git rebase --abort" &&
|
2022-01-26 13:05:40 +00:00
|
|
|
test_when_finished "rm -f .git/post-checkout.args" &&
|
2022-01-26 13:05:39 +00:00
|
|
|
git update-ref refs/heads/rebase-fast-forward three &&
|
|
|
|
git checkout two &&
|
2022-01-26 13:05:40 +00:00
|
|
|
rm -f .git/post-checkout.args &&
|
2022-01-26 13:05:39 +00:00
|
|
|
echo untracked >three.t &&
|
|
|
|
test_when_finished "rm three.t" &&
|
|
|
|
test_must_fail git rebase $args HEAD rebase-fast-forward 2>err &&
|
2022-01-26 13:05:40 +00:00
|
|
|
grep "untracked working tree files would be overwritten by checkout" err &&
|
|
|
|
test_path_is_missing .git/post-checkout.args
|
|
|
|
|
2022-01-26 13:05:39 +00:00
|
|
|
'
|
2022-01-26 13:05:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
test_rebase --apply &&
|
|
|
|
test_rebase --merge
|
2018-12-29 21:37:59 +00:00
|
|
|
|
2009-03-03 05:37:51 +00:00
|
|
|
test_expect_success 'post-checkout hook is triggered by clone' '
|
2018-12-29 21:37:58 +00:00
|
|
|
mkdir -p templates/hooks &&
|
|
|
|
write_script templates/hooks/post-checkout <<-\EOF &&
|
2019-02-08 11:32:33 +00:00
|
|
|
echo "$@" >"$GIT_DIR/post-checkout.args"
|
2018-12-29 21:37:58 +00:00
|
|
|
EOF
|
2009-03-03 05:37:51 +00:00
|
|
|
git clone --template=templates . clone3 &&
|
|
|
|
test -f clone3/.git/post-checkout.args
|
|
|
|
'
|
|
|
|
|
2007-09-26 21:31:01 +00:00
|
|
|
test_done
|