undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t7403: modernize style

Browse Source 
Change the indentation to use tabs consistently and start content on the
line after the paren opening a subshell.

Also don't put a space in ">file" and remove ":" from ": >file" to be
consistent with the majority of tests elsewhere.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
John Keeping 2013-06-16 15:18:14 +01:00 committed by Junio C Hamano
parent 8120e421bb
commit 031129cbe0
1 changed files with 183 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
t/t7403-submodule-sync.sh
View File

@ -11,54 +11,72 @@ These tests exercise the "git submodule sync" subcommand.
. ./test-lib.sh . ./test-lib.sh
test_expect_success setup ' test_expect_success setup '
echo file > file && echo file >file &&
git add file && git add file &&
test_tick && test_tick &&
git commit -m upstream && git commit -m upstream &&
git clone . super && git clone . super &&
git clone super submodule && git clone super submodule &&
(cd submodule && (
cd submodule &&
git submodule add ../submodule sub-submodule && git submodule add ../submodule sub-submodule &&
test_tick && test_tick &&
git commit -m "sub-submodule" git commit -m "sub-submodule"
) && ) &&
(cd super && (
cd super &&
git submodule add ../submodule submodule && git submodule add ../submodule submodule &&
test_tick && test_tick &&
git commit -m "submodule" git commit -m "submodule"
) && ) &&
git clone super super-clone && git clone super super-clone &&
(cd super-clone && git submodule update --init --recursive) && (
cd super-clone &&
git submodule update --init --recursive
) &&
git clone super empty-clone && git clone super empty-clone &&
(cd empty-clone && git submodule init) && (
cd empty-clone &&
git submodule init
) &&
git clone super top-only-clone && git clone super top-only-clone &&
git clone super relative-clone && git clone super relative-clone &&
(cd relative-clone && git submodule update --init --recursive) && (
cd relative-clone &&
git submodule update --init --recursive
) &&
git clone super recursive-clone && git clone super recursive-clone &&
(cd recursive-clone && git submodule update --init --recursive) (
cd recursive-clone &&
git submodule update --init --recursive
)
' '
test_expect_success 'change submodule' ' test_expect_success 'change submodule' '
(cd submodule && (
echo second line >> file && cd submodule &&
echo second line >>file &&
test_tick && test_tick &&
git commit -a -m "change submodule" git commit -a -m "change submodule"
) )
' '
test_expect_success 'change submodule url' ' test_expect_success 'change submodule url' '
(cd super && (
cd super &&
cd submodule && cd submodule &&
git checkout master && git checkout master &&
git pull git pull
) && ) &&
mv submodule moved-submodule && mv submodule moved-submodule &&
(cd moved-submodule && (
cd moved-submodule &&
git config -f .gitmodules submodule.sub-submodule.url ../moved-submodule && git config -f .gitmodules submodule.sub-submodule.url ../moved-submodule &&
test_tick && test_tick &&
git commit -a -m moved-sub-submodule git commit -a -m moved-sub-submodule
) && ) &&
(cd super && (
cd super &&
git config -f .gitmodules submodule.submodule.url ../moved-submodule && git config -f .gitmodules submodule.submodule.url ../moved-submodule &&
test_tick && test_tick &&
git commit -a -m moved-submodule git commit -a -m moved-submodule
@ -66,46 +84,57 @@ test_expect_success 'change submodule url' '
' '
test_expect_success '"git submodule sync" should update submodule URLs' ' test_expect_success '"git submodule sync" should update submodule URLs' '
(cd super-clone && (
cd super-clone &&
git pull --no-recurse-submodules && git pull --no-recurse-submodules &&
git submodule sync git submodule sync
) && ) &&
test -d "$(cd super-clone/submodule && test -d "$(
cd super-clone/submodule &&
git config remote.origin.url git config remote.origin.url
)" && )" &&
test ! -d "$(cd super-clone/submodule/sub-submodule && test ! -d "$(
cd super-clone/submodule/sub-submodule &&
git config remote.origin.url git config remote.origin.url
)" && )" &&
(cd super-clone/submodule && (
cd super-clone/submodule &&
git checkout master && git checkout master &&
git pull git pull
) && ) &&
(cd super-clone && (
cd super-clone &&
test -d "$(git config submodule.submodule.url)" test -d "$(git config submodule.submodule.url)"
) )
' '
test_expect_success '"git submodule sync --recursive" should update all submodule URLs' ' test_expect_success '"git submodule sync --recursive" should update all submodule URLs' '
(cd super-clone && (
(cd submodule && cd super-clone &&
(
cd submodule &&
git pull --no-recurse-submodules git pull --no-recurse-submodules
) && ) &&
git submodule sync --recursive git submodule sync --recursive
) && ) &&
test -d "$(cd super-clone/submodule && test -d "$(
cd super-clone/submodule &&
git config remote.origin.url git config remote.origin.url
)" && )" &&
test -d "$(cd super-clone/submodule/sub-submodule && test -d "$(
cd super-clone/submodule/sub-submodule &&
git config remote.origin.url git config remote.origin.url
)" && )" &&
(cd super-clone/submodule/sub-submodule && (
cd super-clone/submodule/sub-submodule &&
git checkout master && git checkout master &&
git pull git pull
) )
' '
test_expect_success '"git submodule sync" should update known submodule URLs' ' test_expect_success '"git submodule sync" should update known submodule URLs' '
(cd empty-clone && (
cd empty-clone &&
git pull && git pull &&
git submodule sync && git submodule sync &&
test -d "$(git config submodule.submodule.url)" test -d "$(git config submodule.submodule.url)"
@ -113,7 +142,8 @@ test_expect_success '"git submodule sync" should update known submodule URLs' '
' '
test_expect_success '"git submodule sync" should not vivify uninteresting submodule' ' test_expect_success '"git submodule sync" should not vivify uninteresting submodule' '
(cd top-only-clone && (
cd top-only-clone &&
git pull && git pull &&
git submodule sync && git submodule sync &&
test -z "$(git config submodule.submodule.url)" && test -z "$(git config submodule.submodule.url)" &&
@ -123,10 +153,12 @@ test_expect_success '"git submodule sync" should not vivify uninteresting submod
' '
test_expect_success '"git submodule sync" handles origin URL of the form foo' ' test_expect_success '"git submodule sync" handles origin URL of the form foo' '
(cd relative-clone && (
cd relative-clone &&
git remote set-url origin foo && git remote set-url origin foo &&
git submodule sync && git submodule sync &&
(cd submodule && (
cd submodule &&
#actual fails with: "cannot strip off url foo #actual fails with: "cannot strip off url foo
test "$(git config remote.origin.url)" = "../submodule" test "$(git config remote.origin.url)" = "../submodule"
) )
@ -134,38 +166,46 @@ test_expect_success '"git submodule sync" handles origin URL of the form foo' '
' '
test_expect_success '"git submodule sync" handles origin URL of the form foo/bar' ' test_expect_success '"git submodule sync" handles origin URL of the form foo/bar' '
(cd relative-clone && (
cd relative-clone &&
git remote set-url origin foo/bar && git remote set-url origin foo/bar &&
git submodule sync && git submodule sync &&
(cd submodule && (
cd submodule &&
#actual foo/submodule #actual foo/submodule
test "$(git config remote.origin.url)" = "../foo/submodule" test "$(git config remote.origin.url)" = "../foo/submodule"
) )
(cd submodule/sub-submodule && (
cd submodule/sub-submodule &&
test "$(git config remote.origin.url)" != "../../foo/submodule" test "$(git config remote.origin.url)" != "../../foo/submodule"
) )
) )
' '
test_expect_success '"git submodule sync --recursive" propagates changes in origin' ' test_expect_success '"git submodule sync --recursive" propagates changes in origin' '
(cd recursive-clone && (
cd recursive-clone &&
git remote set-url origin foo/bar && git remote set-url origin foo/bar &&
git submodule sync --recursive && git submodule sync --recursive &&
(cd submodule && (
cd submodule &&
#actual foo/submodule #actual foo/submodule
test "$(git config remote.origin.url)" = "../foo/submodule" test "$(git config remote.origin.url)" = "../foo/submodule"
) )
(cd submodule/sub-submodule && (
cd submodule/sub-submodule &&
test "$(git config remote.origin.url)" = "../../foo/submodule" test "$(git config remote.origin.url)" = "../../foo/submodule"
) )
) )
' '
test_expect_success '"git submodule sync" handles origin URL of the form ./foo' ' test_expect_success '"git submodule sync" handles origin URL of the form ./foo' '
(cd relative-clone && (
cd relative-clone &&
git remote set-url origin ./foo && git remote set-url origin ./foo &&
git submodule sync && git submodule sync &&
(cd submodule && (
cd submodule &&
#actual ./submodule #actual ./submodule
test "$(git config remote.origin.url)" = "../submodule" test "$(git config remote.origin.url)" = "../submodule"
) )
@ -173,10 +213,12 @@ test_expect_success '"git submodule sync" handles origin URL of the form ./foo'
' '
test_expect_success '"git submodule sync" handles origin URL of the form ./foo/bar' ' test_expect_success '"git submodule sync" handles origin URL of the form ./foo/bar' '
(cd relative-clone && (
cd relative-clone &&
git remote set-url origin ./foo/bar && git remote set-url origin ./foo/bar &&
git submodule sync && git submodule sync &&
(cd submodule && (
cd submodule &&
#actual ./foo/submodule #actual ./foo/submodule
test "$(git config remote.origin.url)" = "../foo/submodule" test "$(git config remote.origin.url)" = "../foo/submodule"
) )
@ -184,10 +226,12 @@ test_expect_success '"git submodule sync" handles origin URL of the form ./foo/b
' '
test_expect_success '"git submodule sync" handles origin URL of the form ../foo' ' test_expect_success '"git submodule sync" handles origin URL of the form ../foo' '
(cd relative-clone && (
cd relative-clone &&
git remote set-url origin ../foo && git remote set-url origin ../foo &&
git submodule sync && git submodule sync &&
(cd submodule && (
cd submodule &&
#actual ../submodule #actual ../submodule
test "$(git config remote.origin.url)" = "../../submodule" test "$(git config remote.origin.url)" = "../../submodule"
) )
@ -195,10 +239,12 @@ test_expect_success '"git submodule sync" handles origin URL of the form ../foo'
' '
test_expect_success '"git submodule sync" handles origin URL of the form ../foo/bar' ' test_expect_success '"git submodule sync" handles origin URL of the form ../foo/bar' '
(cd relative-clone && (
cd relative-clone &&
git remote set-url origin ../foo/bar && git remote set-url origin ../foo/bar &&
git submodule sync && git submodule sync &&
(cd submodule && (
cd submodule &&
#actual ../foo/submodule #actual ../foo/submodule
test "$(git config remote.origin.url)" = "../../foo/submodule" test "$(git config remote.origin.url)" = "../../foo/submodule"
) )
@ -206,18 +252,22 @@ test_expect_success '"git submodule sync" handles origin URL of the form ../foo/
' '
test_expect_success '"git submodule sync" handles origin URL of the form ../foo/bar with deeply nested submodule' ' test_expect_success '"git submodule sync" handles origin URL of the form ../foo/bar with deeply nested submodule' '
(cd relative-clone && (
cd relative-clone &&
git remote set-url origin ../foo/bar && git remote set-url origin ../foo/bar &&
mkdir -p a/b/c && mkdir -p a/b/c &&
( cd a/b/c && (
cd a/b/c &&
git init && git init &&
:> .gitignore && >.gitignore &&
git add .gitignore && git add .gitignore &&
test_tick && test_tick &&
git commit -m "initial commit" ) && git commit -m "initial commit"
) &&
git submodule add ../bar/a/b/c ./a/b/c && git submodule add ../bar/a/b/c ./a/b/c &&
git submodule sync && git submodule sync &&
(cd a/b/c && (
cd a/b/c &&
#actual ../foo/bar/a/b/c #actual ../foo/bar/a/b/c
test "$(git config remote.origin.url)" = "../../../../foo/bar/a/b/c" test "$(git config remote.origin.url)" = "../../../../foo/bar/a/b/c"
) )