development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dg/submodule-in-dismembered-working-tree'

Browse source 
Finishing touches to the new test script.

* dg/submodule-in-dismembered-working-tree:
  t7409: make sure submodule is initialized and updated in more detail
This commit is contained in:
Junio C Hamano 2012-07-30 12:56:25 -07:00
parent fbea95ce10 95e7705310
commit 8de8bb8051
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
t/t7409-submodule-detached-worktree.sh
View file

@ -15,7 +15,11 @@ TEST_NO_CREATE_REPO=1
test_expect_success 'submodule on detached working tree' ' test_expect_success 'submodule on detached working tree' '
git init --bare remote && git init --bare remote &&
test_create_repo bundle1 && test_create_repo bundle1 &&
(cd bundle1 && test_commit "shoot") && (
cd bundle1 &&
test_commit "shoot" &&
git rev-parse --verify HEAD >../expect
) &&
mkdir home && mkdir home &&
( (
cd home && cd home &&
@ -23,14 +27,27 @@ test_expect_success 'submodule on detached working tree' '
git clone --bare ../remote .dotfiles && git clone --bare ../remote .dotfiles &&
git submodule add ../bundle1 .vim/bundle/sogood && git submodule add ../bundle1 .vim/bundle/sogood &&
test_commit "sogood" && test_commit "sogood" &&
(
unset GIT_WORK_TREE GIT_DIR &&
cd .vim/bundle/sogood &&
git rev-parse --verify HEAD >actual &&
test_cmp ../../../../expect actual
) &&
git push origin master git push origin master
) && ) &&
mkdir home2 && mkdir home2 &&
( (
cd home2 && cd home2 &&
export GIT_WORK_TREE="$(pwd)" GIT_DIR="$(pwd)/.dotfiles" &&
git clone --bare ../remote .dotfiles && git clone --bare ../remote .dotfiles &&
git submodule update --init export GIT_WORK_TREE="$(pwd)" GIT_DIR="$(pwd)/.dotfiles" &&
git checkout master &&
git submodule update --init &&
(
unset GIT_WORK_TREE GIT_DIR &&
cd .vim/bundle/sogood &&
git rev-parse --verify HEAD >actual &&
test_cmp ../../../../expect actual
)
) )
' '
@ -42,6 +59,7 @@ test_expect_success 'submodule on detached working pointed by core.worktree' '
git clone --bare ../remote "$GIT_DIR" && git clone --bare ../remote "$GIT_DIR" &&
git config core.bare false && git config core.bare false &&
git config core.worktree .. && git config core.worktree .. &&
git checkout master &&
git submodule add ../bundle1 .vim/bundle/dupe && git submodule add ../bundle1 .vim/bundle/dupe &&
test_commit "dupe" && test_commit "dupe" &&
git push origin master git push origin master
@ -52,9 +70,8 @@ test_expect_success 'submodule on detached working pointed by core.worktree' '
git config core.bare false && git config core.bare false &&
git config core.worktree .. && git config core.worktree .. &&
git pull && git pull &&
git submodule update && git submodule update --init &&
git submodule status && test -f .vim/bundle/dupe/shoot.t
test -d .vim/bundle/dupe
) )
' '