334afbc76f
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>
216 lines
4.9 KiB
Bash
Executable File
216 lines
4.9 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007 Johannes Schindelin
|
|
#
|
|
|
|
test_description='Test shared repository initialization'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
# Remove a default ACL from the test dir if possible.
|
|
setfacl -k . 2>/dev/null
|
|
|
|
# User must have read permissions to the repo -> failure on --shared=0400
|
|
test_expect_success 'shared = 0400 (faulty permission u-w)' '
|
|
test_when_finished "rm -rf sub" &&
|
|
mkdir sub && (
|
|
cd sub &&
|
|
test_must_fail git init --shared=0400
|
|
)
|
|
'
|
|
|
|
for u in 002 022
|
|
do
|
|
test_expect_success POSIXPERM "shared=1 does not clear bits preset by umask $u" '
|
|
mkdir sub && (
|
|
cd sub &&
|
|
umask $u &&
|
|
git init --shared=1 &&
|
|
test 1 = "$(git config core.sharedrepository)"
|
|
) &&
|
|
actual=$(ls -l sub/.git/HEAD) &&
|
|
case "$actual" in
|
|
-rw-rw-r--*)
|
|
: happy
|
|
;;
|
|
*)
|
|
echo Oops, .git/HEAD is not 0664 but $actual
|
|
false
|
|
;;
|
|
esac
|
|
'
|
|
rm -rf sub
|
|
done
|
|
|
|
test_expect_success 'shared=all' '
|
|
mkdir sub &&
|
|
cd sub &&
|
|
git init --shared=all &&
|
|
test 2 = $(git config core.sharedrepository)
|
|
'
|
|
|
|
test_expect_success POSIXPERM 'update-server-info honors core.sharedRepository' '
|
|
: > a1 &&
|
|
git add a1 &&
|
|
test_tick &&
|
|
git commit -m a1 &&
|
|
umask 0277 &&
|
|
git update-server-info &&
|
|
actual="$(ls -l .git/info/refs)" &&
|
|
case "$actual" in
|
|
-r--r--r--*)
|
|
: happy
|
|
;;
|
|
*)
|
|
echo Oops, .git/info/refs is not 0444
|
|
false
|
|
;;
|
|
esac
|
|
'
|
|
|
|
for u in 0660:rw-rw---- \
|
|
0640:rw-r----- \
|
|
0600:rw------- \
|
|
0666:rw-rw-rw- \
|
|
0664:rw-rw-r--
|
|
do
|
|
x=$(expr "$u" : ".*:\([rw-]*\)") &&
|
|
y=$(echo "$x" | sed -e "s/w/-/g") &&
|
|
u=$(expr "$u" : "\([0-7]*\)") &&
|
|
git config core.sharedrepository "$u" &&
|
|
umask 0277 &&
|
|
|
|
test_expect_success POSIXPERM "shared = $u ($y) ro" '
|
|
|
|
rm -f .git/info/refs &&
|
|
git update-server-info &&
|
|
actual="$(test_modebits .git/info/refs)" &&
|
|
verbose test "x$actual" = "x-$y"
|
|
|
|
'
|
|
|
|
umask 077 &&
|
|
test_expect_success POSIXPERM "shared = $u ($x) rw" '
|
|
|
|
rm -f .git/info/refs &&
|
|
git update-server-info &&
|
|
actual="$(test_modebits .git/info/refs)" &&
|
|
verbose test "x$actual" = "x-$x"
|
|
|
|
'
|
|
|
|
done
|
|
|
|
test_expect_success POSIXPERM 'info/refs respects umask in unshared repo' '
|
|
rm -f .git/info/refs &&
|
|
test_unconfig core.sharedrepository &&
|
|
umask 002 &&
|
|
git update-server-info &&
|
|
echo "-rw-rw-r--" >expect &&
|
|
test_modebits .git/info/refs >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success POSIXPERM 'git reflog expire honors core.sharedRepository' '
|
|
umask 077 &&
|
|
git config core.sharedRepository group &&
|
|
git reflog expire --all &&
|
|
actual="$(ls -l .git/logs/refs/heads/master)" &&
|
|
case "$actual" in
|
|
-rw-rw-*)
|
|
: happy
|
|
;;
|
|
*)
|
|
echo Ooops, .git/logs/refs/heads/master is not 0662 [$actual]
|
|
false
|
|
;;
|
|
esac
|
|
'
|
|
|
|
test_expect_success POSIXPERM 'forced modes' '
|
|
mkdir -p templates/hooks &&
|
|
echo update-server-info >templates/hooks/post-update &&
|
|
chmod +x templates/hooks/post-update &&
|
|
echo : >random-file &&
|
|
mkdir new &&
|
|
(
|
|
cd new &&
|
|
umask 002 &&
|
|
git init --shared=0660 --template=templates &&
|
|
>frotz &&
|
|
git add frotz &&
|
|
git commit -a -m initial &&
|
|
git repack
|
|
) &&
|
|
# List repository files meant to be protected; note that
|
|
# COMMIT_EDITMSG does not matter---0mode is not about a
|
|
# repository with a work tree.
|
|
find new/.git -type f -name COMMIT_EDITMSG -prune -o -print |
|
|
xargs ls -ld >actual &&
|
|
|
|
# Everything must be unaccessible to others
|
|
test -z "$(sed -e "/^.......---/d" actual)" &&
|
|
|
|
# All directories must have either 2770 or 770
|
|
test -z "$(sed -n -e "/^drwxrw[sx]---/d" -e "/^d/p" actual)" &&
|
|
|
|
# post-update hook must be 0770
|
|
test -z "$(sed -n -e "/post-update/{
|
|
/^-rwxrwx---/d
|
|
p
|
|
}" actual)" &&
|
|
|
|
# All files inside objects must be accessible by us
|
|
test -z "$(sed -n -e "/objects\//{
|
|
/^d/d
|
|
/^-r.-r.----/d
|
|
p
|
|
}" actual)"
|
|
'
|
|
|
|
test_expect_success POSIXPERM 'remote init does not use config from cwd' '
|
|
git config core.sharedrepository 0666 &&
|
|
umask 0022 &&
|
|
git init --bare child.git &&
|
|
echo "-rw-r--r--" >expect &&
|
|
test_modebits child.git/config >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success POSIXPERM 're-init respects core.sharedrepository (local)' '
|
|
git config core.sharedrepository 0666 &&
|
|
umask 0022 &&
|
|
echo whatever >templates/foo &&
|
|
git init --template=templates &&
|
|
echo "-rw-rw-rw-" >expect &&
|
|
test_modebits .git/foo >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success POSIXPERM 're-init respects core.sharedrepository (remote)' '
|
|
rm -rf child.git &&
|
|
umask 0022 &&
|
|
git init --bare --shared=0666 child.git &&
|
|
test_path_is_missing child.git/foo &&
|
|
git init --bare --template=templates child.git &&
|
|
echo "-rw-rw-rw-" >expect &&
|
|
test_modebits child.git/foo >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success POSIXPERM 'template can set core.sharedrepository' '
|
|
rm -rf child.git &&
|
|
umask 0022 &&
|
|
git config core.sharedrepository 0666 &&
|
|
cp .git/config templates/config &&
|
|
git init --bare --template=templates child.git &&
|
|
echo "-rw-rw-rw-" >expect &&
|
|
test_modebits child.git/HEAD >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|