diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-16 12:49:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-16 12:49:22 -0800 |
| commit | 7eaf4af426ee29812d49cfa5328e2af8b3f8af95 (patch) | |
| tree | 475a6e667c27a29565510d311ab72ec284755e3f /t | |
| parent | c835288be4cac722a20f9601a920879206a0ff61 (diff) | |
| parent | 69e7236c6df44bfcde8913972b75a6ccb360d58f (diff) | |
| download | git-7eaf4af426ee29812d49cfa5328e2af8b3f8af95.tar.gz | |
Merge branch 'jn/submodule-b-current'
* jn/submodule-b-current:
git submodule: Remove now obsolete tests before cloning a repo
git submodule -b ... of current HEAD fails
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 782b0a3ece..2c49db9f62 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -421,11 +421,29 @@ test_expect_success 'add submodules without specifying an explicit path' ' git commit -m "repo commit 1" ) && git clone --bare repo/ bare.git && - cd addtest && - git submodule add "$submodurl/repo" && - git config -f .gitmodules submodule.repo.path repo && - git submodule add "$submodurl/bare.git" && - git config -f .gitmodules submodule.bare.path bare + ( + cd addtest && + git submodule add "$submodurl/repo" && + git config -f .gitmodules submodule.repo.path repo && + git submodule add "$submodurl/bare.git" && + git config -f .gitmodules submodule.bare.path bare + ) +' + +test_expect_success 'add should fail when path is used by a file' ' + ( + cd addtest && + touch file && + test_must_fail git submodule add "$submodurl/repo" file + ) +' + +test_expect_success 'add should fail when path is used by an existing directory' ' + ( + cd addtest && + mkdir empty-dir && + test_must_fail git submodule add "$submodurl/repo" empty-dir + ) ' test_done |