kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t5526: avoid depending on a specific default branch name 

While at it, use different default branch names for the three different
repositories involved in the test script: this makes it easier to debug
failures, too (otherwise you have to wonder which `master` branch was
meant: the super project's? The submodule's? The nested submodule's?).

Note: this touches code that was originally modified to prepare for
renaming the default branch name to `main`. This patch side-steps that
effort completely by overriding the initial branch name explicitly.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 2020-12-04 14:34:21 +00:00 committed by Junio C Hamano
parent 3a0b884cab
commit b618a2d9df
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
t/t5526-fetch-submodules.sh
View File

@ -18,7 +18,7 @@ add_upstream_commit() {
head2=$(git rev-parse --short HEAD) && head2=$(git rev-parse --short HEAD) &&
echo "Fetching submodule submodule" > ../expect.err && echo "Fetching submodule submodule" > ../expect.err &&
echo "From $pwd/submodule" >> ../expect.err && echo "From $pwd/submodule" >> ../expect.err &&
echo " $head1..$head2 main -> origin/main" >> ../expect.err echo " $head1..$head2 sub -> origin/sub" >> ../expect.err
) && ) &&
( (
cd deepsubmodule && cd deepsubmodule &&
@ -30,7 +30,7 @@ add_upstream_commit() {
head2=$(git rev-parse --short HEAD) && head2=$(git rev-parse --short HEAD) &&
echo "Fetching submodule submodule/subdir/deepsubmodule" >> ../expect.err echo "Fetching submodule submodule/subdir/deepsubmodule" >> ../expect.err
echo "From $pwd/deepsubmodule" >> ../expect.err && echo "From $pwd/deepsubmodule" >> ../expect.err &&
echo " $head1..$head2 main -> origin/main" >> ../expect.err echo " $head1..$head2 deep -> origin/deep" >> ../expect.err
) )
} }


@ -41,7 +41,8 @@ test_expect_success setup '
git init && git init &&
echo deepsubcontent > deepsubfile && echo deepsubcontent > deepsubfile &&
git add deepsubfile && git add deepsubfile &&
git commit -m new deepsubfile git commit -m new deepsubfile &&
git branch -M deep
) && ) &&
mkdir submodule && mkdir submodule &&
( (
@ -50,10 +51,12 @@ test_expect_success setup '
echo subcontent > subfile && echo subcontent > subfile &&
git add subfile && git add subfile &&
git submodule add "$pwd/deepsubmodule" subdir/deepsubmodule && git submodule add "$pwd/deepsubmodule" subdir/deepsubmodule &&
git commit -a -m new git commit -a -m new &&
git branch -M sub
) && ) &&
git submodule add "$pwd/submodule" submodule && git submodule add "$pwd/submodule" submodule &&
git commit -am initial && git commit -am initial &&
git branch -M super &&
git clone . downstream && git clone . downstream &&
( (
cd downstream && cd downstream &&
@ -245,7 +248,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion stops when no new submodu
git commit -m "new submodule" && git commit -m "new submodule" &&
head2=$(git rev-parse --short HEAD) && head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." > expect.err.sub && echo "From $pwd/." > expect.err.sub &&
echo " $head1..$head2 main -> origin/main" >>expect.err.sub && echo " $head1..$head2 super -> origin/super" >>expect.err.sub &&
head -3 expect.err >> expect.err.sub && head -3 expect.err >> expect.err.sub &&
( (
cd downstream && cd downstream &&
@ -263,7 +266,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion doesn't happen when new s
git commit -m "new file" && git commit -m "new file" &&
head2=$(git rev-parse --short HEAD) && head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." > expect.err.file && echo "From $pwd/." > expect.err.file &&
echo " $head1..$head2 main -> origin/main" >> expect.err.file && echo " $head1..$head2 super -> origin/super" >> expect.err.file &&
( (
cd downstream && cd downstream &&
git fetch >../actual.out 2>../actual.err git fetch >../actual.out 2>../actual.err
@ -287,7 +290,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion picks up config in submod
git commit -m "new submodule" && git commit -m "new submodule" &&
head2=$(git rev-parse --short HEAD) && head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." > expect.err.sub && echo "From $pwd/." > expect.err.sub &&
echo " $head1..$head2 main -> origin/main" >> expect.err.sub && echo " $head1..$head2 super -> origin/super" >> expect.err.sub &&
cat expect.err >> expect.err.sub && cat expect.err >> expect.err.sub &&
( (
cd downstream && cd downstream &&
@ -316,14 +319,14 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion picks up all submodules w
head2=$(git rev-parse --short HEAD) && head2=$(git rev-parse --short HEAD) &&
echo "Fetching submodule submodule" > ../expect.err.sub && echo "Fetching submodule submodule" > ../expect.err.sub &&
echo "From $pwd/submodule" >> ../expect.err.sub && echo "From $pwd/submodule" >> ../expect.err.sub &&
echo " $head1..$head2 main -> origin/main" >> ../expect.err.sub echo " $head1..$head2 sub -> origin/sub" >> ../expect.err.sub
) && ) &&
head1=$(git rev-parse --short HEAD) && head1=$(git rev-parse --short HEAD) &&
git add submodule && git add submodule &&
git commit -m "new submodule" && git commit -m "new submodule" &&
head2=$(git rev-parse --short HEAD) && head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." > expect.err.2 && echo "From $pwd/." > expect.err.2 &&
echo " $head1..$head2 main -> origin/main" >> expect.err.2 && echo " $head1..$head2 super -> origin/super" >> expect.err.2 &&
cat expect.err.sub >> expect.err.2 && cat expect.err.sub >> expect.err.2 &&
tail -3 expect.err >> expect.err.2 && tail -3 expect.err >> expect.err.2 &&
( (
@ -349,7 +352,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' do
head2=$(git rev-parse --short HEAD) && head2=$(git rev-parse --short HEAD) &&
echo Fetching submodule submodule > ../expect.err.sub && echo Fetching submodule submodule > ../expect.err.sub &&
echo "From $pwd/submodule" >> ../expect.err.sub && echo "From $pwd/submodule" >> ../expect.err.sub &&
echo " $head1..$head2 main -> origin/main" >> ../expect.err.sub echo " $head1..$head2 sub -> origin/sub" >> ../expect.err.sub
) && ) &&
( (
cd downstream && cd downstream &&
@ -368,7 +371,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' re
head2=$(git rev-parse --short HEAD) && head2=$(git rev-parse --short HEAD) &&
tail -3 expect.err > expect.err.deepsub && tail -3 expect.err > expect.err.deepsub &&
echo "From $pwd/." > expect.err && echo "From $pwd/." > expect.err &&
echo " $head1..$head2 main -> origin/main" >>expect.err && echo " $head1..$head2 super -> origin/super" >>expect.err &&
cat expect.err.sub >> expect.err && cat expect.err.sub >> expect.err &&
cat expect.err.deepsub >> expect.err && cat expect.err.deepsub >> expect.err &&
( (
@ -397,7 +400,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' st
git commit -m "new file" && git commit -m "new file" &&
head2=$(git rev-parse --short HEAD) && head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." > expect.err.file && echo "From $pwd/." > expect.err.file &&
echo " $head1..$head2 main -> origin/main" >> expect.err.file && echo " $head1..$head2 super -> origin/super" >> expect.err.file &&
( (
cd downstream && cd downstream &&
git fetch --recurse-submodules=on-demand >../actual.out 2>../actual.err git fetch --recurse-submodules=on-demand >../actual.out 2>../actual.err
@ -418,7 +421,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'fetch.recurseSubmodules=on-demand'
git commit -m "new submodule" && git commit -m "new submodule" &&
head2=$(git rev-parse --short HEAD) && head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." > expect.err.2 && echo "From $pwd/." > expect.err.2 &&
echo " $head1..$head2 main -> origin/main" >>expect.err.2 && echo " $head1..$head2 super -> origin/super" >>expect.err.2 &&
head -3 expect.err >> expect.err.2 && head -3 expect.err >> expect.err.2 &&
( (
cd downstream && cd downstream &&
@ -446,7 +449,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'submodule.<sub>.fetchRecurseSubmod
git commit -m "new submodule" && git commit -m "new submodule" &&
head2=$(git rev-parse --short HEAD) && head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." > expect.err.2 && echo "From $pwd/." > expect.err.2 &&
echo " $head1..$head2 main -> origin/main" >>expect.err.2 && echo " $head1..$head2 super -> origin/super" >>expect.err.2 &&
head -3 expect.err >> expect.err.2 && head -3 expect.err >> expect.err.2 &&
( (
cd downstream && cd downstream &&
@ -472,7 +475,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "don't fetch submodule when newly re
git commit -m "submodule rewound" && git commit -m "submodule rewound" &&
head2=$(git rev-parse --short HEAD) && head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." > expect.err && echo "From $pwd/." > expect.err &&
echo " $head1..$head2 main -> origin/main" >> expect.err && echo " $head1..$head2 super -> origin/super" >> expect.err &&
( (
cd downstream && cd downstream &&
git fetch >../actual.out 2>../actual.err git fetch >../actual.out 2>../actual.err
@ -481,7 +484,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "don't fetch submodule when newly re
test_i18ncmp expect.err actual.err && test_i18ncmp expect.err actual.err &&
( (
cd submodule && cd submodule &&
git checkout -q master git checkout -q sub
) )
' '


@ -497,7 +500,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'fetch.recurseSubmodules=on-demand'
git commit -m "new submodule without .gitmodules" && git commit -m "new submodule without .gitmodules" &&
head2=$(git rev-parse --short HEAD) && head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." >expect.err.2 && echo "From $pwd/." >expect.err.2 &&
echo " $head1..$head2 main -> origin/main" >>expect.err.2 && echo " $head1..$head2 super -> origin/super" >>expect.err.2 &&
head -3 expect.err >>expect.err.2 && head -3 expect.err >>expect.err.2 &&
( (
cd downstream && cd downstream &&
@ -663,9 +666,9 @@ test_expect_success 'fetch new submodule commits on-demand without .gitmodules e
git config -f .gitmodules --remove-section submodule.sub1 && git config -f .gitmodules --remove-section submodule.sub1 &&
git add .gitmodules && git add .gitmodules &&
git commit -m "delete gitmodules file" && git commit -m "delete gitmodules file" &&
git checkout -B master && git checkout -B super &&
git -C downstream fetch && git -C downstream fetch &&
git -C downstream checkout origin/master && git -C downstream checkout origin/super &&


C=$(git -C submodule commit-tree -m "yet another change outside refs/heads" HEAD^{tree}) && C=$(git -C submodule commit-tree -m "yet another change outside refs/heads" HEAD^{tree}) &&
git -C submodule update-ref refs/changes/7 $C && git -C submodule update-ref refs/changes/7 $C &&