2013-01-13 06:17:03 +01:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='check pre-push hooks'
|
2020-11-19 00:44:34 +01: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-19 00:44:19 +01:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
2013-01-13 06:17:03 +01:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success 'setup' '
|
2022-03-17 11:13:16 +01:00
|
|
|
test_hook pre-push <<-\EOF &&
|
|
|
|
cat >actual
|
|
|
|
EOF
|
|
|
|
|
2013-01-13 06:17:03 +01:00
|
|
|
git config push.default upstream &&
|
|
|
|
git init --bare repo1 &&
|
|
|
|
git remote add parent1 repo1 &&
|
|
|
|
test_commit one &&
|
2022-02-18 21:52:58 +01:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
HEAD $(git rev-parse HEAD) refs/heads/foreign $(test_oid zero)
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_when_finished "rm actual" &&
|
|
|
|
git push parent1 HEAD:foreign &&
|
|
|
|
test_cmp expect actual
|
2013-01-13 06:17:03 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
COMMIT1="$(git rev-parse HEAD)"
|
|
|
|
export COMMIT1
|
|
|
|
|
|
|
|
test_expect_success 'push with failing hook' '
|
2022-03-17 11:13:16 +01:00
|
|
|
test_hook pre-push <<-\EOF &&
|
|
|
|
cat >actual &&
|
|
|
|
exit 1
|
|
|
|
EOF
|
|
|
|
|
2013-01-13 06:17:03 +01:00
|
|
|
test_commit two &&
|
2022-02-18 21:52:58 +01:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
HEAD $(git rev-parse HEAD) refs/heads/main $(test_oid zero)
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_when_finished "rm actual" &&
|
|
|
|
test_must_fail git push parent1 HEAD &&
|
|
|
|
test_cmp expect actual
|
2013-01-13 06:17:03 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--no-verify bypasses hook' '
|
2022-02-18 21:52:58 +01:00
|
|
|
git push --no-verify parent1 HEAD &&
|
|
|
|
test_path_is_missing actual
|
2013-01-13 06:17:03 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
COMMIT2="$(git rev-parse HEAD)"
|
|
|
|
export COMMIT2
|
|
|
|
|
|
|
|
test_expect_success 'push with hook' '
|
2022-03-17 11:13:16 +01:00
|
|
|
test_hook --setup pre-push <<-\EOF &&
|
|
|
|
echo "$1" >actual
|
|
|
|
echo "$2" >>actual
|
|
|
|
cat >>actual
|
|
|
|
EOF
|
|
|
|
|
2022-02-18 21:52:59 +01:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
parent1
|
|
|
|
repo1
|
|
|
|
refs/heads/main $COMMIT2 refs/heads/foreign $COMMIT1
|
|
|
|
EOF
|
|
|
|
|
2020-11-19 00:44:34 +01:00
|
|
|
git push parent1 main:foreign &&
|
2022-02-18 21:52:59 +01:00
|
|
|
test_cmp expect actual
|
2013-01-13 06:17:03 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'add a branch' '
|
|
|
|
git checkout -b other parent1/foreign &&
|
|
|
|
test_commit three
|
|
|
|
'
|
|
|
|
|
|
|
|
COMMIT3="$(git rev-parse HEAD)"
|
|
|
|
export COMMIT3
|
|
|
|
|
|
|
|
test_expect_success 'push to default' '
|
2022-02-18 21:52:59 +01:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
parent1
|
|
|
|
repo1
|
|
|
|
refs/heads/other $COMMIT3 refs/heads/foreign $COMMIT2
|
|
|
|
EOF
|
2013-01-13 06:17:03 +01:00
|
|
|
git push &&
|
2022-02-18 21:52:59 +01:00
|
|
|
test_cmp expect actual
|
2013-01-13 06:17:03 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push non-branches' '
|
2022-02-18 21:52:59 +01:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
parent1
|
|
|
|
repo1
|
|
|
|
refs/tags/one $COMMIT1 refs/tags/tag1 $ZERO_OID
|
|
|
|
HEAD~ $COMMIT2 refs/heads/prev $ZERO_OID
|
|
|
|
EOF
|
|
|
|
|
2013-01-13 06:17:03 +01:00
|
|
|
git push parent1 one:tag1 HEAD~:refs/heads/prev &&
|
2022-02-18 21:52:59 +01:00
|
|
|
test_cmp expect actual
|
2013-01-13 06:17:03 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push delete' '
|
2022-02-18 21:52:59 +01:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
parent1
|
|
|
|
repo1
|
|
|
|
(delete) $ZERO_OID refs/heads/prev $COMMIT2
|
|
|
|
EOF
|
|
|
|
|
2013-01-13 06:17:03 +01:00
|
|
|
git push parent1 :prev &&
|
2022-02-18 21:52:59 +01:00
|
|
|
test_cmp expect actual
|
2013-01-13 06:17:03 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push to URL' '
|
2022-02-18 21:52:59 +01:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
repo1
|
|
|
|
repo1
|
|
|
|
HEAD $COMMIT3 refs/heads/other $ZERO_OID
|
|
|
|
EOF
|
|
|
|
|
2013-01-13 06:17:03 +01:00
|
|
|
git push repo1 HEAD &&
|
2022-02-18 21:52:59 +01:00
|
|
|
test_cmp expect actual
|
2013-01-13 06:17:03 +01:00
|
|
|
'
|
|
|
|
|
2015-11-16 09:05:58 +01:00
|
|
|
test_expect_success 'set up many-ref tests' '
|
|
|
|
{
|
tests: fix broken &&-chains in `{...}` groups
The top-level &&-chain checker built into t/test-lib.sh causes tests to
magically exit with code 117 if the &&-chain is broken. However, it has
the shortcoming that the magic does not work within `{...}` groups,
`(...)` subshells, `$(...)` substitutions, or within bodies of compound
statements, such as `if`, `for`, `while`, `case`, etc. `chainlint.sed`
partly fills in the gap by catching broken &&-chains in `(...)`
subshells, but bugs can still lurk behind broken &&-chains in the other
cases.
Fix broken &&-chains in `{...}` groups in order to reduce the number of
possible lurking bugs.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-12-09 06:11:08 +01:00
|
|
|
nr=1000 &&
|
2015-11-16 09:05:58 +01:00
|
|
|
while test $nr -lt 2000
|
|
|
|
do
|
tests: fix broken &&-chains in compound statements
The top-level &&-chain checker built into t/test-lib.sh causes tests to
magically exit with code 117 if the &&-chain is broken. However, it has
the shortcoming that the magic does not work within `{...}` groups,
`(...)` subshells, `$(...)` substitutions, or within bodies of compound
statements, such as `if`, `for`, `while`, `case`, etc. `chainlint.sed`
partly fills in the gap by catching broken &&-chains in `(...)`
subshells, but bugs can still lurk behind broken &&-chains in the other
cases.
Fix broken &&-chains in compound statements in order to reduce the
number of possible lurking bugs.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-12-09 06:11:06 +01:00
|
|
|
nr=$(( $nr + 1 )) &&
|
2021-12-09 06:11:14 +01:00
|
|
|
echo "create refs/heads/b/$nr $COMMIT3" || return 1
|
2015-11-16 09:05:58 +01:00
|
|
|
done
|
|
|
|
} | git update-ref --stdin
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'sigpipe does not cause pre-push hook failure' '
|
2022-03-17 11:13:16 +01:00
|
|
|
test_hook --clobber pre-push <<-\EOF &&
|
|
|
|
exit 0
|
|
|
|
EOF
|
2015-11-16 09:05:58 +01:00
|
|
|
git push parent1 "refs/heads/b/*:refs/heads/b/*"
|
|
|
|
'
|
2013-01-13 06:17:03 +01:00
|
|
|
|
|
|
|
test_done
|