From: Jiang Xin <zhiyou.jx@xxxxxxxxxxxxxxx>
Various updates for t1301:
* t1301: fix wrong template dir for git-init
* t1301: use test_when_finished for cleanup
* t1301: do not change $CWD in "shared=all" test case
## range-diff v2...v3
1: bc68ffb41c = 1: 7a66766a10 t1301: fix wrong template dir for git-init
2: ae2b2f8afc = 2: 97eefb1e67 t1301: use test_when_finished for cleanup
3: f1bf255e5a ! 3: 9575f2eb1c t1301: do not change $CWD in "shared=all" test case
@@ Commit message
So it is a safe change for us to run the test case "shared=all" in
current repository instead of creating and changing to "sub".
- For the next test case, we no longer run it in the "sub" repository
- which is initialized from an empty template, we should not assume the
- path ".git/info" is missing. So add option "-p" to mkdir.
+ For the next test case, the path ".git/info" is assumed to be missing,
+ but we no longer run the test case in the "sub" repository which is
+ initialized from an empty template. In order for the test case to run
+ properly, we can set "TEST_CREATE_REPO_NO_TEMPLATE=1" to initialize the
+ default repository without a template.
Helped-by: Junio C Hamano <gitster@xxxxxxxxx>
+ Helped-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
Signed-off-by: Jiang Xin <zhiyou.jx@xxxxxxxxxxxxxxx>
## t/t1301-shared-repo.sh ##
+@@ t/t1301-shared-repo.sh: test_description='Test shared repository initialization'
+ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
++TEST_CREATE_REPO_NO_TEMPLATE=1
+ . ./test-lib.sh
+
+ # Remove a default ACL from the test dir if possible.
@@ t/t1301-shared-repo.sh: do
done
@@ t/t1301-shared-repo.sh: do
git init --template= --shared=all &&
test 2 = $(git config core.sharedrepository)
'
-@@ t/t1301-shared-repo.sh: test_expect_success POSIXPERM 'update-server-info honors core.sharedRepository'
- git add a1 &&
- test_tick &&
- git commit -m a1 &&
-- mkdir .git/info &&
-+ mkdir -p .git/info &&
- umask 0277 &&
- git update-server-info &&
- actual="$(ls -l .git/info/refs)" &&
--
Jiang Xin (3):
t1301: fix wrong template dir for git-init
t1301: use test_when_finished for cleanup
t1301: do not change $CWD in "shared=all" test case
t/t1301-shared-repo.sh | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
--
2.39.0.rc0
