diff options
| author | Jon Seymour <jon.seymour@gmail.com> | 2012-06-06 15:57:29 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-06 22:40:59 +0400 |
| commit | 967b2c66738fe6b168ead0c3106ac47fb9ae22c7 (patch) | |
| tree | 4b67e412a47cd16e0678d260065892239abbc03d /t/t7403-submodule-sync.sh | |
| parent | 49301c64f3612d68058efb428a74133ac6e4a071 (diff) | |
submodule: fix sync handling of some relative superproject origin URLs
When the origin URL of the superproject is itself relative, git submodule sync
configures the remote.origin.url configuration property of the submodule
with a path that is relative to the work tree of the superproject
rather than the work tree of the submodule.
To fix this an 'up_path' that navigates from the work tree of the submodule
to the work tree of the superproject needs to be prepended to the URL
otherwise calculated.
Correct handling of superproject origin URLs like foo, ./foo and ./foo/bar is
left to a subsequent patch since an additional change is required to handle
these cases.
The documentation of resolve_relative_url() is expanded to give a more thorough
description of the function's objective.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7403-submodule-sync.sh')
| -rwxr-xr-x | t/t7403-submodule-sync.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh index 56b933da45..98bc74a4e9 100755 --- a/t/t7403-submodule-sync.sh +++ b/t/t7403-submodule-sync.sh @@ -99,7 +99,7 @@ test_expect_failure '"git submodule sync" handles origin URL of the form foo' ' ) ' -test_expect_failure '"git submodule sync" handles origin URL of the form foo/bar' ' +test_expect_success '"git submodule sync" handles origin URL of the form foo/bar' ' (cd relative-clone && git remote set-url origin foo/bar && git submodule sync && @@ -132,7 +132,7 @@ test_expect_failure '"git submodule sync" handles origin URL of the form ./foo/b ) ' -test_expect_failure '"git submodule sync" handles origin URL of the form ../foo' ' +test_expect_success '"git submodule sync" handles origin URL of the form ../foo' ' (cd relative-clone && git remote set-url origin ../foo && git submodule sync && @@ -143,7 +143,7 @@ test_expect_failure '"git submodule sync" handles origin URL of the form ../foo' ) ' -test_expect_failure '"git submodule sync" handles origin URL of the form ../foo/bar' ' +test_expect_success '"git submodule sync" handles origin URL of the form ../foo/bar' ' (cd relative-clone && git remote set-url origin ../foo/bar && git submodule sync && @@ -154,7 +154,7 @@ test_expect_failure '"git submodule sync" handles origin URL of the form ../foo/ ) ' -test_expect_failure '"git submodule sync" handles origin URL of the form ../foo/bar with deeply nested submodule' ' +test_expect_success '"git submodule sync" handles origin URL of the form ../foo/bar with deeply nested submodule' ' (cd relative-clone && git remote set-url origin ../foo/bar && mkdir -p a/b/c && |