Daniel Graña <dan...@gmail.com> writes: > * Check submodule is correctly initialized and updated after cloning .dotfiles > > Signed-off-by: Daniel Graña <dan...@gmail.com> > ---
Thanks. > @@ -23,14 +27,27 @@ test_expect_success 'submodule on detached working tree' ' > git clone --bare ../remote .dotfiles && > git submodule add ../bundle1 .vim/bundle/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 > - ) && > + ) I do not think you meant to break the && chain here on purpose. I'll queue with a minor fix-up here. > mkdir home2 && > ( > cd home2 && > - export GIT_WORK_TREE="$(pwd)" GIT_DIR="$(pwd)/.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 config core.bare false && > git config core.worktree .. && > + git checkout master && > git submodule add ../bundle1 .vim/bundle/dupe && > test_commit "dupe" && > 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.worktree .. && > git pull && > - git submodule update && > - git submodule status && > - test -d .vim/bundle/dupe > + git submodule update --init && > + test -e .vim/bundle/dupe/shoot.t > ) > ' -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
