mirror of
https://github.com/git/git.git
synced 2024-11-06 17:23:00 +01:00
58ca9ad4d6
A test in t7404-submodule-foreach purports to test that the --cached flag is properly noticed by --recursive calls to the foreach command as it descends into nested submodules. However, the test really does not perform this test since the change it looks for is in a top-level submodule handled by the first invocation of the command. To properly test for the flag being passed to recursive invocations, the change must be buried deeper in the hierarchy. Move the change one level deeper so it properly verifies the recursive machinery of the 'git submodule status' command. Signed-off-by: Phil Hord <hordp@cisco.com> Signed-off-by: Jeff King <peff@peff.net>
316 lines
9.2 KiB
Bash
Executable file
316 lines
9.2 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2009 Johan Herland
|
|
#
|
|
|
|
test_description='Test "git submodule foreach"
|
|
|
|
This test verifies that "git submodule foreach" correctly visits all submodules
|
|
that are currently checked out.
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
test_expect_success 'setup a submodule tree' '
|
|
echo file > file &&
|
|
git add file &&
|
|
test_tick &&
|
|
git commit -m upstream &&
|
|
git clone . super &&
|
|
git clone super submodule &&
|
|
(
|
|
cd super &&
|
|
git submodule add ../submodule sub1 &&
|
|
git submodule add ../submodule sub2 &&
|
|
git submodule add ../submodule sub3 &&
|
|
git config -f .gitmodules --rename-section \
|
|
submodule.sub1 submodule.foo1 &&
|
|
git config -f .gitmodules --rename-section \
|
|
submodule.sub2 submodule.foo2 &&
|
|
git config -f .gitmodules --rename-section \
|
|
submodule.sub3 submodule.foo3 &&
|
|
git add .gitmodules &&
|
|
test_tick &&
|
|
git commit -m "submodules" &&
|
|
git submodule init sub1 &&
|
|
git submodule init sub2 &&
|
|
git submodule init sub3
|
|
) &&
|
|
(
|
|
cd submodule &&
|
|
echo different > file &&
|
|
git add file &&
|
|
test_tick &&
|
|
git commit -m "different"
|
|
) &&
|
|
(
|
|
cd super &&
|
|
(
|
|
cd sub3 &&
|
|
git pull
|
|
) &&
|
|
git add sub3 &&
|
|
test_tick &&
|
|
git commit -m "update sub3"
|
|
)
|
|
'
|
|
|
|
sub1sha1=$(cd super/sub1 && git rev-parse HEAD)
|
|
sub3sha1=$(cd super/sub3 && git rev-parse HEAD)
|
|
|
|
pwd=$(pwd)
|
|
|
|
cat > expect <<EOF
|
|
Entering 'sub1'
|
|
$pwd/clone-foo1-sub1-$sub1sha1
|
|
Entering 'sub3'
|
|
$pwd/clone-foo3-sub3-$sub3sha1
|
|
EOF
|
|
|
|
test_expect_success 'test basic "submodule foreach" usage' '
|
|
git clone super clone &&
|
|
(
|
|
cd clone &&
|
|
git submodule update --init -- sub1 sub3 &&
|
|
git submodule foreach "echo \$toplevel-\$name-\$path-\$sha1" > ../actual &&
|
|
git config foo.bar zar &&
|
|
git submodule foreach "git config --file \"\$toplevel/.git/config\" foo.bar"
|
|
) &&
|
|
test_i18ncmp expect actual
|
|
'
|
|
|
|
test_expect_success 'setup nested submodules' '
|
|
git clone submodule nested1 &&
|
|
git clone submodule nested2 &&
|
|
git clone submodule nested3 &&
|
|
(
|
|
cd nested3 &&
|
|
git submodule add ../submodule submodule &&
|
|
test_tick &&
|
|
git commit -m "submodule" &&
|
|
git submodule init submodule
|
|
) &&
|
|
(
|
|
cd nested2 &&
|
|
git submodule add ../nested3 nested3 &&
|
|
test_tick &&
|
|
git commit -m "nested3" &&
|
|
git submodule init nested3
|
|
) &&
|
|
(
|
|
cd nested1 &&
|
|
git submodule add ../nested2 nested2 &&
|
|
test_tick &&
|
|
git commit -m "nested2" &&
|
|
git submodule init nested2
|
|
) &&
|
|
(
|
|
cd super &&
|
|
git submodule add ../nested1 nested1 &&
|
|
test_tick &&
|
|
git commit -m "nested1" &&
|
|
git submodule init nested1
|
|
)
|
|
'
|
|
|
|
test_expect_success 'use "submodule foreach" to checkout 2nd level submodule' '
|
|
git clone super clone2 &&
|
|
(
|
|
cd clone2 &&
|
|
test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
|
|
test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
|
|
test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
|
|
test_must_fail git rev-parse --resolve-git-dir nested1/.git &&
|
|
git submodule update --init &&
|
|
git rev-parse --resolve-git-dir sub1/.git &&
|
|
git rev-parse --resolve-git-dir sub2/.git &&
|
|
git rev-parse --resolve-git-dir sub3/.git &&
|
|
git rev-parse --resolve-git-dir nested1/.git &&
|
|
test_must_fail git rev-parse --resolve-git-dir nested1/nested2/.git &&
|
|
git submodule foreach "git submodule update --init" &&
|
|
git rev-parse --resolve-git-dir nested1/nested1/nested2/.git
|
|
test_must_fail git rev-parse --resolve-git-dir nested1/nested2/nested3/.git
|
|
)
|
|
'
|
|
|
|
test_expect_success 'use "foreach --recursive" to checkout all submodules' '
|
|
(
|
|
cd clone2 &&
|
|
git submodule foreach --recursive "git submodule update --init" &&
|
|
git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
|
|
git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
|
|
)
|
|
'
|
|
|
|
cat > expect <<EOF
|
|
Entering 'nested1'
|
|
Entering 'nested1/nested2'
|
|
Entering 'nested1/nested2/nested3'
|
|
Entering 'nested1/nested2/nested3/submodule'
|
|
Entering 'sub1'
|
|
Entering 'sub2'
|
|
Entering 'sub3'
|
|
EOF
|
|
|
|
test_expect_success 'test messages from "foreach --recursive"' '
|
|
(
|
|
cd clone2 &&
|
|
git submodule foreach --recursive "true" > ../actual
|
|
) &&
|
|
test_i18ncmp expect actual
|
|
'
|
|
|
|
cat > expect <<EOF
|
|
nested1-nested1
|
|
nested2-nested2
|
|
nested3-nested3
|
|
submodule-submodule
|
|
foo1-sub1
|
|
foo2-sub2
|
|
foo3-sub3
|
|
EOF
|
|
|
|
test_expect_success 'test "foreach --quiet --recursive"' '
|
|
(
|
|
cd clone2 &&
|
|
git submodule foreach -q --recursive "echo \$name-\$path" > ../actual
|
|
) &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'use "update --recursive" to checkout all submodules' '
|
|
git clone super clone3 &&
|
|
(
|
|
cd clone3 &&
|
|
test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
|
|
test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
|
|
test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
|
|
test_must_fail git rev-parse --resolve-git-dir nested1/.git &&
|
|
git submodule update --init --recursive &&
|
|
git rev-parse --resolve-git-dir sub1/.git &&
|
|
git rev-parse --resolve-git-dir sub2/.git &&
|
|
git rev-parse --resolve-git-dir sub3/.git &&
|
|
git rev-parse --resolve-git-dir nested1/.git &&
|
|
git rev-parse --resolve-git-dir nested1/nested2/.git &&
|
|
git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
|
|
git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
|
|
)
|
|
'
|
|
|
|
nested1sha1=$(cd clone3/nested1 && git rev-parse HEAD)
|
|
nested2sha1=$(cd clone3/nested1/nested2 && git rev-parse HEAD)
|
|
nested3sha1=$(cd clone3/nested1/nested2/nested3 && git rev-parse HEAD)
|
|
submodulesha1=$(cd clone3/nested1/nested2/nested3/submodule && git rev-parse HEAD)
|
|
sub1sha1=$(cd clone3/sub1 && git rev-parse HEAD)
|
|
sub2sha1=$(cd clone3/sub2 && git rev-parse HEAD)
|
|
sub3sha1=$(cd clone3/sub3 && git rev-parse HEAD)
|
|
sub1sha1_short=$(cd clone3/sub1 && git rev-parse --short HEAD)
|
|
sub2sha1_short=$(cd clone3/sub2 && git rev-parse --short HEAD)
|
|
|
|
cat > expect <<EOF
|
|
$nested1sha1 nested1 (heads/master)
|
|
$nested2sha1 nested1/nested2 (heads/master)
|
|
$nested3sha1 nested1/nested2/nested3 (heads/master)
|
|
$submodulesha1 nested1/nested2/nested3/submodule (heads/master)
|
|
$sub1sha1 sub1 ($sub1sha1_short)
|
|
$sub2sha1 sub2 ($sub2sha1_short)
|
|
$sub3sha1 sub3 (heads/master)
|
|
EOF
|
|
|
|
test_expect_success 'test "status --recursive"' '
|
|
(
|
|
cd clone3 &&
|
|
git submodule status --recursive > ../actual
|
|
) &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
sed -e "/nested2 /s/.*/+$nested2sha1 nested1\/nested2 (file2~1)/;/sub[1-3]/d" < expect > expect2
|
|
mv -f expect2 expect
|
|
|
|
test_expect_success 'ensure "status --cached --recursive" preserves the --cached flag' '
|
|
(
|
|
cd clone3 &&
|
|
(
|
|
cd nested1/nested2 &&
|
|
test_commit file2
|
|
) &&
|
|
git submodule status --cached --recursive -- nested1 > ../actual
|
|
) &&
|
|
if test_have_prereq MINGW
|
|
then
|
|
dos2unix actual
|
|
fi &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'use "git clone --recursive" to checkout all submodules' '
|
|
git clone --recursive super clone4 &&
|
|
(
|
|
cd clone4 &&
|
|
git rev-parse --resolve-git-dir .git &&
|
|
git rev-parse --resolve-git-dir sub1/.git &&
|
|
git rev-parse --resolve-git-dir sub2/.git &&
|
|
git rev-parse --resolve-git-dir sub3/.git &&
|
|
git rev-parse --resolve-git-dir nested1/.git &&
|
|
git rev-parse --resolve-git-dir nested1/nested2/.git &&
|
|
git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
|
|
git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
|
|
)
|
|
'
|
|
|
|
test_expect_success 'test "update --recursive" with a flag with spaces' '
|
|
git clone super "common objects" &&
|
|
git clone super clone5 &&
|
|
(
|
|
cd clone5 &&
|
|
test_must_fail git rev-parse --resolve-git-dir d nested1/.git &&
|
|
git submodule update --init --recursive --reference="$(dirname "$PWD")/common objects" &&
|
|
git rev-parse --resolve-git-dir nested1/.git &&
|
|
git rev-parse --resolve-git-dir nested1/nested2/.git &&
|
|
git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
|
|
test -f .git/modules/nested1/objects/info/alternates &&
|
|
test -f .git/modules/nested1/modules/nested2/objects/info/alternates &&
|
|
test -f .git/modules/nested1/modules/nested2/modules/nested3/objects/info/alternates
|
|
)
|
|
'
|
|
|
|
test_expect_success 'use "update --recursive nested1" to checkout all submodules rooted in nested1' '
|
|
git clone super clone6 &&
|
|
(
|
|
cd clone6 &&
|
|
test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
|
|
test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
|
|
test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
|
|
test_must_fail git rev-parse --resolve-git-dir nested1/.git &&
|
|
git submodule update --init --recursive -- nested1 &&
|
|
test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
|
|
test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
|
|
test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
|
|
git rev-parse --resolve-git-dir nested1/.git &&
|
|
git rev-parse --resolve-git-dir nested1/nested2/.git &&
|
|
git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
|
|
git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
|
|
)
|
|
'
|
|
|
|
test_expect_success 'command passed to foreach retains notion of stdin' '
|
|
(
|
|
cd super &&
|
|
git submodule foreach echo success >../expected &&
|
|
yes | git submodule foreach "read y && test \"x\$y\" = xy && echo success" >../actual
|
|
) &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'command passed to foreach --recursive retains notion of stdin' '
|
|
(
|
|
cd clone2 &&
|
|
git submodule foreach --recursive echo success >../expected &&
|
|
yes | git submodule foreach --recursive "read y && test \"x\$y\" = xy && echo success" >../actual
|
|
) &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_done
|