2010-11-12 13:54:52 +01:00
#!/bin/sh
# Copyright (c) 2010, Jens Lehmann
test_description = 'Recursive "git fetch" for submodules'
. ./test-lib.sh
pwd = $( pwd )
add_upstream_commit( ) {
(
cd submodule &&
head1 = $( git rev-parse --short HEAD) &&
echo new >> subfile &&
test_tick &&
git add subfile &&
git commit -m new subfile &&
head2 = $( git rev-parse --short HEAD) &&
2015-12-16 01:04:06 +01:00
echo "Fetching submodule submodule" > ../expect.err &&
echo " From $pwd /submodule " >> ../expect.err &&
2020-10-23 16:00:05 +02:00
echo " $head1 .. $head2 main -> origin/main " >> ../expect.err
2010-11-12 13:54:52 +01:00
) &&
(
cd deepsubmodule &&
head1 = $( git rev-parse --short HEAD) &&
echo new >> deepsubfile &&
test_tick &&
git add deepsubfile &&
git commit -m new deepsubfile &&
head2 = $( git rev-parse --short HEAD) &&
2015-12-16 01:04:06 +01:00
echo "Fetching submodule submodule/subdir/deepsubmodule" >> ../expect.err
2010-11-12 13:54:52 +01:00
echo " From $pwd /deepsubmodule " >> ../expect.err &&
2020-10-23 16:00:05 +02:00
echo " $head1 .. $head2 main -> origin/main " >> ../expect.err
2010-11-12 13:54:52 +01:00
)
}
test_expect_success setup '
mkdir deepsubmodule &&
(
cd deepsubmodule &&
git init &&
echo deepsubcontent > deepsubfile &&
git add deepsubfile &&
git commit -m new deepsubfile
) &&
mkdir submodule &&
(
cd submodule &&
git init &&
echo subcontent > subfile &&
git add subfile &&
2011-06-20 20:18:03 +02:00
git submodule add " $pwd /deepsubmodule " subdir/deepsubmodule &&
2010-11-12 13:54:52 +01:00
git commit -a -m new
) &&
git submodule add " $pwd /submodule " submodule &&
git commit -am initial &&
git clone . downstream &&
(
cd downstream &&
git submodule update --init --recursive
2015-12-16 01:04:06 +01:00
)
2010-11-12 13:54:52 +01:00
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "fetch --recurse-submodules recurses into submodules" '
2010-11-12 13:54:52 +01:00
add_upstream_commit &&
(
cd downstream &&
git fetch --recurse-submodules >../actual.out 2>../actual.err
2011-04-12 20:23:23 +02:00
) &&
2015-12-16 01:04:06 +01:00
test_must_be_empty actual.out &&
2011-04-12 20:23:23 +02:00
test_i18ncmp expect.err actual.err
2010-11-12 13:54:52 +01:00
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "submodule.recurse option triggers recursive fetch" '
2017-06-01 02:30:50 +02:00
add_upstream_commit &&
(
cd downstream &&
git -c submodule.recurse fetch >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
test_i18ncmp expect.err actual.err
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "fetch --recurse-submodules -j2 has the same output behaviour" '
2015-12-16 01:04:12 +01:00
add_upstream_commit &&
(
cd downstream &&
2018-02-24 00:39:46 +01:00
GIT_TRACE = " $TRASH_DIRECTORY /trace.out " git fetch --recurse-submodules -j2 2>../actual.err
2015-12-16 01:04:12 +01:00
) &&
test_must_be_empty actual.out &&
test_i18ncmp expect.err actual.err &&
grep "2 tasks" trace.out
'
2010-11-12 13:54:52 +01:00
test_expect_success "fetch alone only fetches superproject" '
add_upstream_commit &&
(
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
2018-08-19 23:57:22 +02:00
test_must_be_empty actual.out &&
test_must_be_empty actual.err
2010-11-12 13:54:52 +01:00
'
2010-11-11 00:55:41 +01:00
test_expect_success "fetch --no-recurse-submodules only fetches superproject" '
(
cd downstream &&
git fetch --no-recurse-submodules >../actual.out 2>../actual.err
) &&
2018-08-19 23:57:22 +02:00
test_must_be_empty actual.out &&
test_must_be_empty actual.err
2010-11-11 00:55:41 +01:00
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "using fetchRecurseSubmodules=true in .gitmodules recurses into submodules" '
2010-11-11 00:55:41 +01:00
(
cd downstream &&
git config -f .gitmodules submodule.submodule.fetchRecurseSubmodules true &&
git fetch >../actual.out 2>../actual.err
2011-04-12 20:23:23 +02:00
) &&
2015-12-16 01:04:06 +01:00
test_must_be_empty actual.out &&
2011-04-12 20:23:23 +02:00
test_i18ncmp expect.err actual.err
2010-11-11 00:55:41 +01:00
'
test_expect_success "--no-recurse-submodules overrides .gitmodules config" '
add_upstream_commit &&
(
cd downstream &&
git fetch --no-recurse-submodules >../actual.out 2>../actual.err
) &&
2018-08-19 23:57:22 +02:00
test_must_be_empty actual.out &&
test_must_be_empty actual.err
2010-11-11 00:55:41 +01:00
'
test_expect_success "using fetchRecurseSubmodules=false in .git/config overrides setting in .gitmodules" '
(
cd downstream &&
git config submodule.submodule.fetchRecurseSubmodules false &&
git fetch >../actual.out 2>../actual.err
) &&
2018-08-19 23:57:22 +02:00
test_must_be_empty actual.out &&
test_must_be_empty actual.err
2010-11-11 00:55:41 +01:00
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "--recurse-submodules overrides fetchRecurseSubmodules setting from .git/config" '
2010-11-11 00:55:41 +01:00
(
cd downstream &&
git fetch --recurse-submodules >../actual.out 2>../actual.err &&
2011-01-31 17:51:25 +01:00
git config --unset -f .gitmodules submodule.submodule.fetchRecurseSubmodules &&
2010-11-11 00:55:41 +01:00
git config --unset submodule.submodule.fetchRecurseSubmodules
2011-04-12 20:23:23 +02:00
) &&
2015-12-16 01:04:06 +01:00
test_must_be_empty actual.out &&
2011-04-12 20:23:23 +02:00
test_i18ncmp expect.err actual.err
2010-11-11 00:55:41 +01:00
'
2010-11-12 13:54:52 +01:00
test_expect_success "--quiet propagates to submodules" '
(
cd downstream &&
git fetch --recurse-submodules --quiet >../actual.out 2>../actual.err
) &&
2018-08-19 23:57:22 +02:00
test_must_be_empty actual.out &&
test_must_be_empty actual.err
2010-11-12 13:54:52 +01:00
'
2015-12-16 01:04:12 +01:00
test_expect_success "--quiet propagates to parallel submodules" '
(
cd downstream &&
git fetch --recurse-submodules -j 2 --quiet >../actual.out 2>../actual.err
) &&
2018-08-19 23:57:22 +02:00
test_must_be_empty actual.out &&
test_must_be_empty actual.err
2015-12-16 01:04:12 +01:00
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "--dry-run propagates to submodules" '
2010-11-12 13:54:52 +01:00
add_upstream_commit &&
(
cd downstream &&
git fetch --recurse-submodules --dry-run >../actual.out 2>../actual.err
2011-04-12 20:23:23 +02:00
) &&
2015-12-16 01:04:06 +01:00
test_must_be_empty actual.out &&
2011-04-12 20:23:23 +02:00
test_i18ncmp expect.err actual.err
2011-02-23 00:41:52 +01:00
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "Without --dry-run propagates to submodules" '
2010-11-12 13:54:52 +01:00
(
cd downstream &&
git fetch --recurse-submodules >../actual.out 2>../actual.err
2011-04-12 20:23:23 +02:00
) &&
2015-12-16 01:04:06 +01:00
test_must_be_empty actual.out &&
2011-04-12 20:23:23 +02:00
test_i18ncmp expect.err actual.err
2010-11-12 13:54:52 +01:00
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "recurseSubmodules=true propagates into submodules" '
2010-11-11 00:55:02 +01:00
add_upstream_commit &&
(
cd downstream &&
2017-08-17 12:36:13 +02:00
git config fetch.recurseSubmodules true &&
2010-11-11 00:55:02 +01:00
git fetch >../actual.out 2>../actual.err
2011-04-12 20:23:23 +02:00
) &&
2015-12-16 01:04:06 +01:00
test_must_be_empty actual.out &&
2011-04-12 20:23:23 +02:00
test_i18ncmp expect.err actual.err
2010-11-11 00:55:02 +01:00
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "--recurse-submodules overrides config in submodule" '
2010-11-11 00:55:02 +01:00
add_upstream_commit &&
(
cd downstream &&
(
cd submodule &&
git config fetch.recurseSubmodules false
) &&
git fetch --recurse-submodules >../actual.out 2>../actual.err
2011-04-12 20:23:23 +02:00
) &&
2015-12-16 01:04:06 +01:00
test_must_be_empty actual.out &&
2011-04-12 20:23:23 +02:00
test_i18ncmp expect.err actual.err
2010-11-11 00:55:02 +01:00
'
test_expect_success "--no-recurse-submodules overrides config setting" '
add_upstream_commit &&
(
cd downstream &&
2017-08-17 12:36:13 +02:00
git config fetch.recurseSubmodules true &&
2010-11-11 00:55:02 +01:00
git fetch --no-recurse-submodules >../actual.out 2>../actual.err
) &&
2018-08-19 23:57:22 +02:00
test_must_be_empty actual.out &&
test_must_be_empty actual.err
2010-11-11 00:55:02 +01:00
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion doesn't happen when no new commits are fetched in the superproject" '
2011-03-06 23:10:46 +01:00
(
cd downstream &&
(
cd submodule &&
git config --unset fetch.recurseSubmodules
) &&
2017-08-17 12:36:13 +02:00
git config --unset fetch.recurseSubmodules &&
2011-03-06 23:10:46 +01:00
git fetch >../actual.out 2>../actual.err
) &&
2018-08-19 23:57:22 +02:00
test_must_be_empty actual.out &&
test_must_be_empty actual.err
2011-03-06 23:10:46 +01:00
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion stops when no new submodule commits are fetched" '
2011-03-06 23:10:46 +01:00
head1 = $( git rev-parse --short HEAD) &&
git add submodule &&
git commit -m "new submodule" &&
head2 = $( git rev-parse --short HEAD) &&
echo " From $pwd /. " > expect.err.sub &&
2020-10-23 16:00:05 +02:00
echo " $head1 .. $head2 main -> origin/main " >>expect.err.sub &&
2015-12-16 01:04:06 +01:00
head -3 expect.err >> expect.err.sub &&
2011-03-06 23:10:46 +01:00
(
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
2011-04-12 20:23:23 +02:00
test_i18ncmp expect.err.sub actual.err &&
2015-12-16 01:04:06 +01:00
test_must_be_empty actual.out
2011-03-06 23:10:46 +01:00
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion doesn't happen when new superproject commits don't change any submodules" '
2011-03-06 23:10:46 +01:00
add_upstream_commit &&
head1 = $( git rev-parse --short HEAD) &&
echo a > file &&
git add file &&
git commit -m "new file" &&
head2 = $( git rev-parse --short HEAD) &&
echo " From $pwd /. " > expect.err.file &&
2020-10-23 16:00:05 +02:00
echo " $head1 .. $head2 main -> origin/main " >> expect.err.file &&
2011-03-06 23:10:46 +01:00
(
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
2018-08-19 23:57:22 +02:00
test_must_be_empty actual.out &&
2011-04-12 20:23:23 +02:00
test_i18ncmp expect.err.file actual.err
2011-03-06 23:10:46 +01:00
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion picks up config in submodule" '
2011-03-06 23:10:46 +01:00
(
cd downstream &&
git fetch --recurse-submodules &&
(
cd submodule &&
git config fetch.recurseSubmodules true
)
) &&
add_upstream_commit &&
head1 = $( git rev-parse --short HEAD) &&
git add submodule &&
git commit -m "new submodule" &&
head2 = $( git rev-parse --short HEAD) &&
echo " From $pwd /. " > expect.err.sub &&
2020-10-23 16:00:05 +02:00
echo " $head1 .. $head2 main -> origin/main " >> expect.err.sub &&
2011-03-06 23:10:46 +01:00
cat expect.err >> expect.err.sub &&
(
cd downstream &&
git fetch >../actual.out 2>../actual.err &&
(
cd submodule &&
git config --unset fetch.recurseSubmodules
)
) &&
2011-04-12 20:23:23 +02:00
test_i18ncmp expect.err.sub actual.err &&
2015-12-16 01:04:06 +01:00
test_must_be_empty actual.out
2011-03-06 23:10:46 +01:00
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion picks up all submodules when necessary" '
2011-03-06 23:10:46 +01:00
add_upstream_commit &&
(
cd submodule &&
(
2011-06-20 20:18:03 +02:00
cd subdir/deepsubmodule &&
2011-03-06 23:10:46 +01:00
git fetch &&
git checkout -q FETCH_HEAD
) &&
head1 = $( git rev-parse --short HEAD^) &&
2011-06-20 20:18:03 +02:00
git add subdir/deepsubmodule &&
2017-08-17 12:36:13 +02:00
git commit -m "new deepsubmodule" &&
2011-03-06 23:10:46 +01:00
head2 = $( git rev-parse --short HEAD) &&
2015-12-16 01:04:06 +01:00
echo "Fetching submodule submodule" > ../expect.err.sub &&
echo " From $pwd /submodule " >> ../expect.err.sub &&
2020-10-23 16:00:05 +02:00
echo " $head1 .. $head2 main -> origin/main " >> ../expect.err.sub
2011-03-06 23:10:46 +01:00
) &&
head1 = $( git rev-parse --short HEAD) &&
git add submodule &&
git commit -m "new submodule" &&
head2 = $( git rev-parse --short HEAD) &&
echo " From $pwd /. " > expect.err.2 &&
2020-10-23 16:00:05 +02:00
echo " $head1 .. $head2 main -> origin/main " >> expect.err.2 &&
2011-03-06 23:10:46 +01:00
cat expect.err.sub >> expect.err.2 &&
2015-12-16 01:04:06 +01:00
tail -3 expect.err >> expect.err.2 &&
2011-03-06 23:10:46 +01:00
(
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
2011-04-12 20:23:23 +02:00
test_i18ncmp expect.err.2 actual.err &&
2015-12-16 01:04:06 +01:00
test_must_be_empty actual.out
2011-03-06 23:10:46 +01:00
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' doesn't recurse when no new commits are fetched in the superproject (and ignores config)" '
2011-03-06 23:11:21 +01:00
add_upstream_commit &&
(
cd submodule &&
(
2011-06-20 20:18:03 +02:00
cd subdir/deepsubmodule &&
2011-03-06 23:11:21 +01:00
git fetch &&
git checkout -q FETCH_HEAD
) &&
head1 = $( git rev-parse --short HEAD^) &&
2011-06-20 20:18:03 +02:00
git add subdir/deepsubmodule &&
2015-03-20 11:07:15 +01:00
git commit -m "new deepsubmodule" &&
2011-03-06 23:11:21 +01:00
head2 = $( git rev-parse --short HEAD) &&
2015-12-16 01:04:06 +01:00
echo Fetching submodule submodule > ../expect.err.sub &&
echo " From $pwd /submodule " >> ../expect.err.sub &&
2020-10-23 16:00:05 +02:00
echo " $head1 .. $head2 main -> origin/main " >> ../expect.err.sub
2011-03-06 23:11:21 +01:00
) &&
(
cd downstream &&
git config fetch.recurseSubmodules true &&
git fetch --recurse-submodules= on-demand >../actual.out 2>../actual.err &&
git config --unset fetch.recurseSubmodules
) &&
2018-08-19 23:57:22 +02:00
test_must_be_empty actual.out &&
test_must_be_empty actual.err
2011-03-06 23:11:21 +01:00
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)" '
2011-03-06 23:11:21 +01:00
head1 = $( git rev-parse --short HEAD) &&
git add submodule &&
git commit -m "new submodule" &&
head2 = $( git rev-parse --short HEAD) &&
2015-12-16 01:04:06 +01:00
tail -3 expect.err > expect.err.deepsub &&
2011-03-06 23:11:21 +01:00
echo " From $pwd /. " > expect.err &&
2020-10-23 16:00:05 +02:00
echo " $head1 .. $head2 main -> origin/main " >>expect.err &&
2011-03-06 23:11:21 +01:00
cat expect.err.sub >> expect.err &&
cat expect.err.deepsub >> expect.err &&
(
cd downstream &&
git config fetch.recurseSubmodules false &&
(
cd submodule &&
2011-06-20 20:18:03 +02:00
git config -f .gitmodules submodule.subdir/deepsubmodule.fetchRecursive false
2011-03-06 23:11:21 +01:00
) &&
git fetch --recurse-submodules= on-demand >../actual.out 2>../actual.err &&
2018-07-02 02:24:01 +02:00
git config --unset fetch.recurseSubmodules &&
2011-03-06 23:11:21 +01:00
(
cd submodule &&
2011-06-20 20:18:03 +02:00
git config --unset -f .gitmodules submodule.subdir/deepsubmodule.fetchRecursive
2011-03-06 23:11:21 +01:00
)
) &&
2015-12-16 01:04:06 +01:00
test_must_be_empty actual.out &&
2011-04-12 20:23:23 +02:00
test_i18ncmp expect.err actual.err
2011-03-06 23:11:21 +01:00
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)" '
2011-03-06 23:11:21 +01:00
add_upstream_commit &&
head1 = $( git rev-parse --short HEAD) &&
echo a >> file &&
git add file &&
git commit -m "new file" &&
head2 = $( git rev-parse --short HEAD) &&
echo " From $pwd /. " > expect.err.file &&
2020-10-23 16:00:05 +02:00
echo " $head1 .. $head2 main -> origin/main " >> expect.err.file &&
2011-03-06 23:11:21 +01:00
(
cd downstream &&
git fetch --recurse-submodules= on-demand >../actual.out 2>../actual.err
) &&
2018-08-19 23:57:22 +02:00
test_must_be_empty actual.out &&
2011-04-12 20:23:23 +02:00
test_i18ncmp expect.err.file actual.err
2011-03-06 23:11:21 +01:00
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "'fetch.recurseSubmodules=on-demand' overrides global config" '
2011-03-06 23:11:48 +01:00
(
cd downstream &&
git fetch --recurse-submodules
) &&
add_upstream_commit &&
git config --global fetch.recurseSubmodules false &&
head1 = $( git rev-parse --short HEAD) &&
git add submodule &&
git commit -m "new submodule" &&
head2 = $( git rev-parse --short HEAD) &&
echo " From $pwd /. " > expect.err.2 &&
2020-10-23 16:00:05 +02:00
echo " $head1 .. $head2 main -> origin/main " >>expect.err.2 &&
2015-12-16 01:04:06 +01:00
head -3 expect.err >> expect.err.2 &&
2011-03-06 23:11:48 +01:00
(
cd downstream &&
git config fetch.recurseSubmodules on-demand &&
git fetch >../actual.out 2>../actual.err
) &&
git config --global --unset fetch.recurseSubmodules &&
(
cd downstream &&
git config --unset fetch.recurseSubmodules
) &&
2015-12-16 01:04:06 +01:00
test_must_be_empty actual.out &&
2011-04-12 20:23:23 +02:00
test_i18ncmp expect.err.2 actual.err
2011-03-06 23:11:48 +01:00
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "'submodule.<sub>.fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules" '
2011-03-06 23:12:19 +01:00
(
cd downstream &&
git fetch --recurse-submodules
) &&
add_upstream_commit &&
git config fetch.recurseSubmodules false &&
head1 = $( git rev-parse --short HEAD) &&
git add submodule &&
git commit -m "new submodule" &&
head2 = $( git rev-parse --short HEAD) &&
echo " From $pwd /. " > expect.err.2 &&
2020-10-23 16:00:05 +02:00
echo " $head1 .. $head2 main -> origin/main " >>expect.err.2 &&
2015-12-16 01:04:06 +01:00
head -3 expect.err >> expect.err.2 &&
2011-03-06 23:12:19 +01:00
(
cd downstream &&
git config submodule.submodule.fetchRecurseSubmodules on-demand &&
git fetch >../actual.out 2>../actual.err
) &&
git config --unset fetch.recurseSubmodules &&
(
cd downstream &&
git config --unset submodule.submodule.fetchRecurseSubmodules
) &&
2015-12-16 01:04:06 +01:00
test_must_be_empty actual.out &&
2011-04-12 20:23:23 +02:00
test_i18ncmp expect.err.2 actual.err
2011-03-06 23:12:19 +01:00
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "don't fetch submodule when newly recorded commits are already present" '
2011-03-06 23:12:58 +01:00
(
cd submodule &&
git checkout -q HEAD^^
) &&
head1 = $( git rev-parse --short HEAD) &&
git add submodule &&
git commit -m "submodule rewound" &&
head2 = $( git rev-parse --short HEAD) &&
echo " From $pwd /. " > expect.err &&
2020-10-23 16:00:05 +02:00
echo " $head1 .. $head2 main -> origin/main " >> expect.err &&
2011-03-06 23:12:58 +01:00
(
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
2018-08-19 23:57:22 +02:00
test_must_be_empty actual.out &&
2017-10-07 00:30:47 +02:00
test_i18ncmp expect.err actual.err &&
(
cd submodule &&
git checkout -q master
)
'
2020-10-23 16:00:05 +02:00
test_expect_success PREPARE_FOR_MAIN_BRANCH "'fetch.recurseSubmodules=on-demand' works also without .gitmodules entry" '
2017-10-07 00:30:47 +02:00
(
cd downstream &&
git fetch --recurse-submodules
) &&
add_upstream_commit &&
head1 = $( git rev-parse --short HEAD) &&
git add submodule &&
git rm .gitmodules &&
git commit -m "new submodule without .gitmodules" &&
head2 = $( git rev-parse --short HEAD) &&
echo " From $pwd /. " >expect.err.2 &&
2020-10-23 16:00:05 +02:00
echo " $head1 .. $head2 main -> origin/main " >>expect.err.2 &&
2017-10-07 00:30:47 +02:00
head -3 expect.err >>expect.err.2 &&
(
cd downstream &&
rm .gitmodules &&
git config fetch.recurseSubmodules on-demand &&
# fake submodule configuration to avoid skipping submodule handling
git config -f .gitmodules submodule.fake.path fake &&
git config -f .gitmodules submodule.fake.url fakeurl &&
git add .gitmodules &&
git config --unset submodule.submodule.url &&
git fetch >../actual.out 2>../actual.err &&
# cleanup
git config --unset fetch.recurseSubmodules &&
git reset --hard
) &&
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 23:57:25 +02:00
test_must_be_empty actual.out &&
2017-10-07 00:30:47 +02:00
test_i18ncmp expect.err.2 actual.err &&
git checkout HEAD^ -- .gitmodules &&
git add .gitmodules &&
git commit -m "new submodule restored .gitmodules"
2011-03-06 23:12:58 +01:00
'
2016-03-01 03:07:13 +01:00
test_expect_success 'fetching submodules respects parallel settings' '
git config fetch.recurseSubmodules true &&
(
cd downstream &&
2018-12-13 20:02:48 +01:00
GIT_TRACE = $( pwd ) /trace.out git fetch &&
grep "1 tasks" trace.out &&
2016-03-01 03:07:13 +01:00
GIT_TRACE = $( pwd ) /trace.out git fetch --jobs 7 &&
grep "7 tasks" trace.out &&
git config submodule.fetchJobs 8 &&
GIT_TRACE = $( pwd ) /trace.out git fetch &&
grep "8 tasks" trace.out &&
GIT_TRACE = $( pwd ) /trace.out git fetch --jobs 9 &&
grep "9 tasks" trace.out
)
'
submodule: avoid auto-discovery in prepare_submodule_repo_env()
The function is used to set up the environment variable used in a
subprocess we spawn in a submodule directory. The callers set up a
child_process structure, find the working tree path of one submodule
and set .dir field to it, and then use start_command() API to spawn
the subprocess like "status", "fetch", etc.
When this happens, we expect that the ".git" (either a directory or
a gitfile that points at the real location) in the current working
directory of the subprocess MUST be the repository for the submodule.
If this ".git" thing is a corrupt repository, however, because
prepare_submodule_repo_env() unsets GIT_DIR and GIT_WORK_TREE, the
subprocess will see ".git", thinks it is not a repository, and
attempt to find one by going up, likely to end up in finding the
repository of the superproject. In some codepaths, this will cause
a command run with the "--recurse-submodules" option to recurse
forever.
By exporting GIT_DIR=.git, disable the auto-discovery logic in the
subprocess, which would instead stop it and report an error.
The test illustrates existing problems in a few callsites of this
function. Without this fix, "git fetch --recurse-submodules", "git
status" and "git diff" keep recursing forever.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-09-01 22:51:48 +02:00
test_expect_success 'fetching submodule into a broken repository' '
# Prepare src and src/sub nested in it
git init src &&
(
cd src &&
git init sub &&
git -C sub commit --allow-empty -m "initial in sub" &&
git submodule add -- ./sub sub &&
git commit -m "initial in top"
) &&
# Clone the old-fashoned way
git clone src dst &&
git -C dst clone ../src/sub sub &&
# Make sure that old-fashoned layout is still supported
git -C dst status &&
# "diff" would find no change
git -C dst diff --exit-code &&
# Recursive-fetch works fine
git -C dst fetch --recurse-submodules &&
# Break the receiving submodule
rm -f dst/sub/.git/HEAD &&
# NOTE: without the fix the following tests will recurse forever!
# They should terminate with an error.
test_must_fail git -C dst status &&
test_must_fail git -C dst diff &&
test_must_fail git -C dst fetch --recurse-submodules
'
2017-10-16 15:58:27 +02:00
test_expect_success "fetch new commits when submodule got renamed" '
git clone . downstream_rename &&
(
cd downstream_rename &&
2018-06-14 19:37:30 +02:00
git submodule update --init --recursive &&
2017-10-16 15:58:27 +02:00
git checkout -b rename &&
git mv submodule submodule_renamed &&
(
cd submodule_renamed &&
git checkout -b rename_sub &&
echo a >a &&
git add a &&
git commit -ma &&
git push origin rename_sub &&
git rev-parse HEAD >../../expect
) &&
git add submodule_renamed &&
git commit -m "update renamed submodule" &&
git push origin rename
) &&
(
cd downstream &&
git fetch --recurse-submodules= on-demand &&
(
cd submodule &&
git rev-parse origin/rename_sub >../../actual
)
) &&
test_cmp expect actual
'
2018-12-06 22:26:55 +01:00
test_expect_success "fetch new submodule commits on-demand outside standard refspec" '
# add a second submodule and ensure it is around in downstream first
git clone submodule sub1 &&
git submodule add ./sub1 &&
git commit -m "adding a second submodule" &&
git -C downstream pull &&
git -C downstream submodule update --init --recursive &&
git checkout --detach &&
C = $( git -C submodule commit-tree -m "new change outside refs/heads" HEAD^{ tree} ) &&
git -C submodule update-ref refs/changes/1 $C &&
git update-index --cacheinfo 160000 $C submodule &&
test_tick &&
D = $( git -C sub1 commit-tree -m "new change outside refs/heads" HEAD^{ tree} ) &&
git -C sub1 update-ref refs/changes/2 $D &&
git update-index --cacheinfo 160000 $D sub1 &&
git commit -m "updated submodules outside of refs/heads" &&
E = $( git rev-parse HEAD) &&
git update-ref refs/changes/3 $E &&
(
cd downstream &&
git fetch --recurse-submodules origin refs/changes/3:refs/heads/my_branch &&
git -C submodule cat-file -t $C &&
git -C sub1 cat-file -t $D &&
git checkout --recurse-submodules FETCH_HEAD
)
'
test_expect_success 'fetch new submodule commit on-demand in FETCH_HEAD' '
# depends on the previous test for setup
C = $( git -C submodule commit-tree -m "another change outside refs/heads" HEAD^{ tree} ) &&
git -C submodule update-ref refs/changes/4 $C &&
git update-index --cacheinfo 160000 $C submodule &&
test_tick &&
D = $( git -C sub1 commit-tree -m "another change outside refs/heads" HEAD^{ tree} ) &&
git -C sub1 update-ref refs/changes/5 $D &&
git update-index --cacheinfo 160000 $D sub1 &&
git commit -m "updated submodules outside of refs/heads" &&
E = $( git rev-parse HEAD) &&
git update-ref refs/changes/6 $E &&
(
cd downstream &&
git fetch --recurse-submodules origin refs/changes/6 &&
git -C submodule cat-file -t $C &&
git -C sub1 cat-file -t $D &&
git checkout --recurse-submodules FETCH_HEAD
)
'
test_expect_success 'fetch new submodule commits on-demand without .gitmodules entry' '
# depends on the previous test for setup
git config -f .gitmodules --remove-section submodule.sub1 &&
git add .gitmodules &&
git commit -m "delete gitmodules file" &&
git checkout -B master &&
git -C downstream fetch &&
git -C downstream checkout origin/master &&
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 update-index --cacheinfo 160000 $C submodule &&
test_tick &&
D = $( git -C sub1 commit-tree -m "yet another change outside refs/heads" HEAD^{ tree} ) &&
git -C sub1 update-ref refs/changes/8 $D &&
git update-index --cacheinfo 160000 $D sub1 &&
git commit -m "updated submodules outside of refs/heads" &&
E = $( git rev-parse HEAD) &&
git update-ref refs/changes/9 $E &&
(
cd downstream &&
git fetch --recurse-submodules origin refs/changes/9 &&
git -C submodule cat-file -t $C &&
git -C sub1 cat-file -t $D &&
git checkout --recurse-submodules FETCH_HEAD
)
'
test_expect_success 'fetch new submodule commit intermittently referenced by superproject' '
# depends on the previous test for setup
D = $( git -C sub1 commit-tree -m "change 10 outside refs/heads" HEAD^{ tree} ) &&
E = $( git -C sub1 commit-tree -m "change 11 outside refs/heads" HEAD^{ tree} ) &&
F = $( git -C sub1 commit-tree -m "change 12 outside refs/heads" HEAD^{ tree} ) &&
git -C sub1 update-ref refs/changes/10 $D &&
git update-index --cacheinfo 160000 $D sub1 &&
git commit -m "updated submodules outside of refs/heads" &&
git -C sub1 update-ref refs/changes/11 $E &&
git update-index --cacheinfo 160000 $E sub1 &&
git commit -m "updated submodules outside of refs/heads" &&
git -C sub1 update-ref refs/changes/12 $F &&
git update-index --cacheinfo 160000 $F sub1 &&
git commit -m "updated submodules outside of refs/heads" &&
G = $( git rev-parse HEAD) &&
git update-ref refs/changes/13 $G &&
(
cd downstream &&
git fetch --recurse-submodules origin refs/changes/13 &&
git -C sub1 cat-file -t $D &&
git -C sub1 cat-file -t $E &&
git -C sub1 cat-file -t $F
)
'
2010-11-12 13:54:52 +01:00
test_done