diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-09-06 23:46:36 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-09-06 23:46:36 (GMT) |
commit | 347c47e61e5daf1efb3503724a431e4316c6eb5b (patch) | |
tree | f5c0c4da1c77b79cfa2831cfa2a55956d7be7528 /t/t7400-submodule-basic.sh | |
parent | c2e0940b44ded03f0af02be95c35b231fea633c1 (diff) | |
parent | fd4ec4f2bb980ce07bb28d5823a95610f251d00b (diff) | |
download | git-347c47e61e5daf1efb3503724a431e4316c6eb5b.zip git-347c47e61e5daf1efb3503724a431e4316c6eb5b.tar.gz git-347c47e61e5daf1efb3503724a431e4316c6eb5b.tar.bz2 |
Merge branch 'jl/maint-fix-test'
* jl/maint-fix-test:
Several tests: cd inside subshell instead of around
Conflicts:
t/t9600-cvsimport.sh
Diffstat (limited to 't/t7400-submodule-basic.sh')
-rwxr-xr-x | t/t7400-submodule-basic.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 9bda970..21b0839 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -413,12 +413,12 @@ test_expect_success 'submodule <invalid-path> warns' ' test_expect_success 'add submodules without specifying an explicit path' ' mkdir repo && - cd repo && + (cd repo && git init && echo r >r && git add r && - git commit -m "repo commit 1" && - cd .. && + git commit -m "repo commit 1" + ) && git clone --bare repo/ bare.git && cd addtest && git submodule add "$submodurl/repo" && |