@matheusbsbs / matheus-bagliano / commits / e942292a3e

tests: don't depend on template-created .git/branches

As noted in c8a58ac5a52 (Revert "Don't create the $GIT_DIR/branches directory on init", 2009-10-31) there was an attempt long ago in 0cc5691a8b0 (Don't create the $GIT_DIR/branches directory on init, 2009-10-30) to get rid of the legacy "branches" directory. We should probably get rid of its creation by removing the "templates/branches--" file. But whatever our default behavior, our tests should be tightened up to explicitly create the .git/branches directory if they rely on our default templates, to make the dependency on those templates clear. So let's amend the two tests that would fail if .git/branches wasn't created. To do this introduce a new "TEST_CREATE_REPO_NO_TEMPLATE" variable, which we'll set before sourcing test-lib.sh, and change the "git clone" and "git init" commands in the tests themselves to explicitly pass "--template=". This way they won't get a .git/branches in either their top-level .git, or in the ones they create. We can then amend the tests that rely on the ".git/branches" directory existing to create it explicitly, and to remove it after its creation. This new "TEST_CREATE_REPO_NO_TEMPLATE" variable is a less heavy-handed version of the "NO_SET_GIT_TEMPLATE_DIR" variable. See a94d305bf80 (t/t0001-init.sh: add test for 'init with init.templatedir set', 2010-02-26) for its implementation. Unlike "TEST_CREATE_REPO_NO_TEMPLATE", this new "TEST_CREATE_REPO_NO_TEMPLATE" variable is narrowly scoped to what the "git init" in test-lib.sh does, as opposed to the global effect of "NO_SET_GIT_TEMPLATE_DIR" and the setting of "GIT_TEMPLATE_DIR" in wrap-for-bin.sh. I experimented with adding a new "GIT_WRAP_FOR_BIN_VIA_TEST_LIB" variable set in test-lib.sh, which would cause wrap-for-bin.sh to not set GIT_TEMPLATE_DIR, GITPERLLIB etc, as we set those in test-lib.sh. I think that's a viable approach, but it would interact e.g. with the appending feature of GITPERLLIB added in 8bade1e12e2 (wrap-for-bin: make bin-wrappers chainable, 2013-07-04). Doing so would allow us to convert the tests in t0001-init.sh that now use "NO_SET_GIT_TEMPLATE_DIR" to simply unset "GIT_TEMPLATE_DIR" in a sub-shell before invoking "git init" or "git clone". I think that approach is worth pursuing, but let's table it for now. Some future wrap-for-bin.sh refactoring can try to address it. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Jun 3, 2022 at 13:15 UTC e942292a3e099f03ae23efd3fd9f09f8b512cadf
3 files changed +21 -5
t/t5505-remote.sh
+4 -2
@@ -923,11 +923,12 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/remotes' '
923 '
924
925 test_expect_success 'migrate a remote from named file in $GIT_DIR/branches' '
926 - git clone one six &&
926 + git clone --template= one six &&
927 origin_url=$(pwd)/one &&
928 (
929 cd six &&
930 git remote rm origin &&
931 + mkdir .git/branches &&
932 echo "$origin_url#main" >.git/branches/origin &&
933 git remote rename origin origin &&
934 test_path_is_missing .git/branches/origin &&
@@ -938,10 +939,11 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/branches' '
939 '
940
941 test_expect_success 'migrate a remote from named file in $GIT_DIR/branches (2)' '
941 - git clone one seven &&
942 + git clone --template= one seven &&
943 (
944 cd seven &&
945 git remote rm origin &&
946 + mkdir .git/branches &&
947 echo "quux#foom" > .git/branches/origin &&
948 git remote rename origin origin &&
949 test_path_is_missing .git/branches/origin &&
t/t5516-fetch-push.sh
+14 -2
@@ -17,6 +17,7 @@ This test checks the following functionality:
17 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
18 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
19
20 +TEST_CREATE_REPO_NO_TEMPLATE=1
21 . ./test-lib.sh
22
23 D=$(pwd)
@@ -25,7 +26,8 @@ mk_empty () {
26 repo_name="$1"
27 test_when_finished "rm -rf \"$repo_name\"" &&
28 test_path_is_missing "$repo_name" &&
28 - git init "$repo_name" &&
29 + git init --template= "$repo_name" &&
30 + mkdir "$repo_name"/.git/hooks &&
31 git -C "$repo_name" config receive.denyCurrentBranch warn
32 }
33
@@ -77,7 +79,7 @@ mk_test_with_hooks() {
79
80 mk_child() {
81 test_when_finished "rm -rf \"$2\"" &&
80 - git clone "$1" "$2"
82 + git clone --template= "$1" "$2"
83 }
84
85 check_push_result () {
@@ -916,6 +918,7 @@ test_expect_success 'fetch with branches' '
918 mk_empty testrepo &&
919 git branch second $the_first_commit &&
920 git checkout second &&
921 + mkdir testrepo/.git/branches &&
922 echo ".." > testrepo/.git/branches/branch1 &&
923 (
924 cd testrepo &&
@@ -929,6 +932,7 @@ test_expect_success 'fetch with branches' '
932
933 test_expect_success 'fetch with branches containing #' '
934 mk_empty testrepo &&
935 + mkdir testrepo/.git/branches &&
936 echo "..#second" > testrepo/.git/branches/branch2 &&
937 (
938 cd testrepo &&
@@ -943,7 +947,11 @@ test_expect_success 'fetch with branches containing #' '
947 test_expect_success 'push with branches' '
948 mk_empty testrepo &&
949 git checkout second &&
950 +
951 + test_when_finished "rm -rf .git/branches" &&
952 + mkdir .git/branches &&
953 echo "testrepo" > .git/branches/branch1 &&
954 +
955 git push branch1 &&
956 (
957 cd testrepo &&
@@ -955,7 +963,11 @@ test_expect_success 'push with branches' '
963
964 test_expect_success 'push with branches containing #' '
965 mk_empty testrepo &&
966 +
967 + test_when_finished "rm -rf .git/branches" &&
968 + mkdir .git/branches &&
969 echo "testrepo#branch3" > .git/branches/branch2 &&
970 +
971 git push branch2 &&
972 (
973 cd testrepo &&
t/test-lib.sh
+3 -1
@@ -1528,7 +1528,9 @@ remove_trash_directory "$TRASH_DIRECTORY" || {
1528 remove_trash=t
1529 if test -z "$TEST_NO_CREATE_REPO"
1530 then
1531 - git init "$TRASH_DIRECTORY" >&3 2>&4 ||
1531 + git init \
1532 + ${TEST_CREATE_REPO_NO_TEMPLATE:+--template=} \
1533 + "$TRASH_DIRECTORY" >&3 2>&4 ||
1534 error "cannot run git init"
1535 else
1536 mkdir -p "$TRASH_DIRECTORY"