mirror of
https://github.com/git/git
synced 2024-09-13 21:34:42 +00:00
Merge branch 'sb/t5614-modernize' into maint
Test clean-up. * sb/t5614-modernize: t5614: don't use subshells
This commit is contained in:
commit
3e69d1b6cd
|
@ -25,76 +25,46 @@ test_expect_success 'setup' '
|
||||||
test_expect_success 'nonshallow clone implies nonshallow submodule' '
|
test_expect_success 'nonshallow clone implies nonshallow submodule' '
|
||||||
test_when_finished "rm -rf super_clone" &&
|
test_when_finished "rm -rf super_clone" &&
|
||||||
git clone --recurse-submodules "file://$pwd/." super_clone &&
|
git clone --recurse-submodules "file://$pwd/." super_clone &&
|
||||||
(
|
git -C super_clone log --oneline >lines &&
|
||||||
cd super_clone &&
|
test_line_count = 3 lines &&
|
||||||
git log --oneline >lines &&
|
git -C super_clone/sub log --oneline >lines &&
|
||||||
test_line_count = 3 lines
|
test_line_count = 3 lines
|
||||||
) &&
|
|
||||||
(
|
|
||||||
cd super_clone/sub &&
|
|
||||||
git log --oneline >lines &&
|
|
||||||
test_line_count = 3 lines
|
|
||||||
)
|
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'shallow clone with shallow submodule' '
|
test_expect_success 'shallow clone with shallow submodule' '
|
||||||
test_when_finished "rm -rf super_clone" &&
|
test_when_finished "rm -rf super_clone" &&
|
||||||
git clone --recurse-submodules --depth 2 --shallow-submodules "file://$pwd/." super_clone &&
|
git clone --recurse-submodules --depth 2 --shallow-submodules "file://$pwd/." super_clone &&
|
||||||
(
|
git -C super_clone log --oneline >lines &&
|
||||||
cd super_clone &&
|
test_line_count = 2 lines &&
|
||||||
git log --oneline >lines &&
|
git -C super_clone/sub log --oneline >lines &&
|
||||||
test_line_count = 2 lines
|
test_line_count = 1 lines
|
||||||
) &&
|
|
||||||
(
|
|
||||||
cd super_clone/sub &&
|
|
||||||
git log --oneline >lines &&
|
|
||||||
test_line_count = 1 lines
|
|
||||||
)
|
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'shallow clone does not imply shallow submodule' '
|
test_expect_success 'shallow clone does not imply shallow submodule' '
|
||||||
test_when_finished "rm -rf super_clone" &&
|
test_when_finished "rm -rf super_clone" &&
|
||||||
git clone --recurse-submodules --depth 2 "file://$pwd/." super_clone &&
|
git clone --recurse-submodules --depth 2 "file://$pwd/." super_clone &&
|
||||||
(
|
git -C super_clone log --oneline >lines &&
|
||||||
cd super_clone &&
|
test_line_count = 2 lines &&
|
||||||
git log --oneline >lines &&
|
git -C super_clone/sub log --oneline >lines &&
|
||||||
test_line_count = 2 lines
|
test_line_count = 3 lines
|
||||||
) &&
|
|
||||||
(
|
|
||||||
cd super_clone/sub &&
|
|
||||||
git log --oneline >lines &&
|
|
||||||
test_line_count = 3 lines
|
|
||||||
)
|
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'shallow clone with non shallow submodule' '
|
test_expect_success 'shallow clone with non shallow submodule' '
|
||||||
test_when_finished "rm -rf super_clone" &&
|
test_when_finished "rm -rf super_clone" &&
|
||||||
git clone --recurse-submodules --depth 2 --no-shallow-submodules "file://$pwd/." super_clone &&
|
git clone --recurse-submodules --depth 2 --no-shallow-submodules "file://$pwd/." super_clone &&
|
||||||
(
|
git -C super_clone log --oneline >lines &&
|
||||||
cd super_clone &&
|
test_line_count = 2 lines &&
|
||||||
git log --oneline >lines &&
|
git -C super_clone/sub log --oneline >lines &&
|
||||||
test_line_count = 2 lines
|
test_line_count = 3 lines
|
||||||
) &&
|
|
||||||
(
|
|
||||||
cd super_clone/sub &&
|
|
||||||
git log --oneline >lines &&
|
|
||||||
test_line_count = 3 lines
|
|
||||||
)
|
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'non shallow clone with shallow submodule' '
|
test_expect_success 'non shallow clone with shallow submodule' '
|
||||||
test_when_finished "rm -rf super_clone" &&
|
test_when_finished "rm -rf super_clone" &&
|
||||||
git clone --recurse-submodules --no-local --shallow-submodules "file://$pwd/." super_clone &&
|
git clone --recurse-submodules --no-local --shallow-submodules "file://$pwd/." super_clone &&
|
||||||
(
|
git -C super_clone log --oneline >lines &&
|
||||||
cd super_clone &&
|
test_line_count = 3 lines &&
|
||||||
git log --oneline >lines &&
|
git -C super_clone/sub log --oneline >lines &&
|
||||||
test_line_count = 3 lines
|
test_line_count = 1 lines
|
||||||
) &&
|
|
||||||
(
|
|
||||||
cd super_clone/sub &&
|
|
||||||
git log --oneline >lines &&
|
|
||||||
test_line_count = 1 lines
|
|
||||||
)
|
|
||||||
'
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
Loading…
Reference in a new issue