diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-16 12:41:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-16 12:41:13 -0700 |
| commit | f4af7f19639457d71c4e9b53892b937468824cac (patch) | |
| tree | 7da4b356951fc0be359dc145939878e941794c6f /t | |
| parent | 2a764974271aa36101b241fef8e2945db9b418a5 (diff) | |
| parent | f22a17e8da25a043950a13f11035930922bb86e7 (diff) | |
| download | git-f4af7f19639457d71c4e9b53892b937468824cac.tar.gz | |
Merge branch 'jl/submodule-add-relurl-wo-upstream' into maint
* 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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 3f115d9ca9..662fe91295 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -448,6 +448,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 && ( |