Re: [PATCH] Improve tests for detached worktree in git-submodule
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 30, 2012, 18:09 UTC
- Message-ID
- <7vfw89qfx2.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1343670719-3635-1-git-send-email-dangra@gmail.com>
Daniel Graña <dangra@gmail.com> writes:
> * Check submodule is correctly initialized and updated after cloning .dotfiles > > Signed-off-by: Daniel Graña <dangra@gmail.com> > ---
Thanks.
Show 13 quoted lines
> @@ -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.
Show 37 quoted lines
> 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 > ) > '