diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-10 15:56:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-10 15:56:17 -0700 |
| commit | efc5fb6a77780c53c6636326ca82ff87b17e4c5f (patch) | |
| tree | df55c7da6100b8b102b183dee72c9137b0d68075 /t/t7400-submodule-basic.sh | |
| parent | Fix some "variable might be used uninitialized" warnings (diff) | |
| parent | Move git-dir for submodules (diff) | |
| download | git-efc5fb6a77780c53c6636326ca82ff87b17e4c5f.tar.gz git-efc5fb6a77780c53c6636326ca82ff87b17e4c5f.zip | |
Merge branch 'fg/submodule-git-file-git-dir'
* fg/submodule-git-file-git-dir:
Move git-dir for submodules
rev-parse: add option --resolve-git-dir <path>
Conflicts:
cache.h
git-submodule.sh
Diffstat (limited to 't/t7400-submodule-basic.sh')
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 69115269c2..695f7afdf3 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -362,10 +362,10 @@ test_expect_success 'update --init' ' git submodule update init > update.out && cat update.out && test_i18ngrep "not initialized" update.out && - ! test -d init/.git && + test_must_fail git rev-parse --resolve-git-dir init/.git && git submodule update --init init && - test -d init/.git + git rev-parse --resolve-git-dir init/.git ' test_expect_success 'do not add files from a submodule' ' |