mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jl/submodule-add-relurl-wo-upstream'

Browse Source 
* jl/submodule-add-relurl-wo-upstream:
  submodule add: clean up duplicated code
  submodule add: allow relative repository path even when no url is set
  submodule add: test failure when url is not configured in superproject

Conflicts:
	git-submodule.sh
This commit is contained in:
Junio C Hamano
2011-07-22 14:24:35 -07:00
parent ed16d0dbf1 f22a17e8da
commit c56dce3b81
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
t/t7400-submodule-basic.sh
View File

@ -446,6 +446,16 @@ test_expect_success 'add should fail when path is used by an existing directory'
)
'
test_expect_success 'use superproject as upstream when path is relative and no url is set there' '
(
cd addtest &&
git submodule add ../repo relative &&
test "$(git config -f .gitmodules submodule.relative.url)" = ../repo &&
git submodule sync relative &&
test "$(git config submodule.relative.url)" = "$submodurl/repo"
)
'
test_expect_success 'set up for relative path tests' '
mkdir reltest &&
(