From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Jens.Lehmann@web.de,
Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH v5 1/2] submodule: document failures handling relative superproject origin URLs
Date: Thu, 24 May 2012 13:37:36 +1000 [thread overview]
Message-ID: <1337830657-16400-2-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <1337830657-16400-1-git-send-email-jon.seymour@gmail.com>
These tests document how submodule sync and init handle various
kinds of relative super project origin URLs. The submodule URL
path is ../subrepo.
6 cases are documented:
foo
foo/bar
./foo
./foo/bar
../foo
../foo/bar
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t7400-submodule-basic.sh | 62 +++++++++++++++++++++++++++++++++++++
t/t7403-submodule-sync.sh | 76 +++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 137 insertions(+), 1 deletion(-)
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 81827e6..08b8d2f 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -507,6 +507,68 @@ test_expect_success 'relative path works with user@host:path' '
)
'
+test_expect_failure 'relative path works with foo' '
+ (
+ cd reltest &&
+ cp pristine-.git-config .git/config &&
+ git config remote.origin.url foo &&
+ # actual: fails with an error
+ git submodule init &&
+ test "$(git config submodule.sub.url)" = ./subrepo
+ )
+'
+
+test_expect_success 'relative path works with foo/bar' '
+ (
+ cd reltest &&
+ cp pristine-.git-config .git/config &&
+ git config remote.origin.url foo/bar &&
+ git submodule init &&
+ test "$(git config submodule.sub.url)" = foo/subrepo
+ )
+'
+
+test_expect_success 'relative path works with ./foo' '
+ (
+ cd reltest &&
+ cp pristine-.git-config .git/config &&
+ git config remote.origin.url ./foo &&
+ git submodule init &&
+ test "$(git config submodule.sub.url)" = ./subrepo
+ )
+'
+
+test_expect_failure 'relative path works with ./foo/bar' '
+ (
+ cd reltest &&
+ cp pristine-.git-config .git/config &&
+ git config remote.origin.url ./foo/bar &&
+ git submodule init &&
+ #actual: ./foo/subrepo
+ test "$(git config submodule.sub.url)" = foo/subrepo
+ )
+'
+
+test_expect_success 'relative path works with ../foo' '
+ (
+ cd reltest &&
+ cp pristine-.git-config .git/config &&
+ git config remote.origin.url ../foo &&
+ git submodule init &&
+ test "$(git config submodule.sub.url)" = ../subrepo
+ )
+'
+
+test_expect_success 'relative path works with ../foo/bar' '
+ (
+ cd reltest &&
+ cp pristine-.git-config .git/config &&
+ git config remote.origin.url ../foo/bar &&
+ git submodule init &&
+ test "$(git config submodule.sub.url)" = ../foo/subrepo
+ )
+'
+
test_expect_success 'moving the superproject does not break submodules' '
(
cd addtest &&
diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index 3620215..9fa4e58 100755
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@ -26,7 +26,9 @@ test_expect_success setup '
(cd super-clone && git submodule update --init) &&
git clone super empty-clone &&
(cd empty-clone && git submodule init) &&
- git clone super top-only-clone
+ git clone super top-only-clone &&
+ git clone super relative-clone &&
+ (cd relative-clone && git submodule update --init)
'
test_expect_success 'change submodule' '
@@ -86,4 +88,76 @@ test_expect_success '"git submodule sync" should not vivify uninteresting submod
)
'
+test_expect_failure '"git submodule sync" handles origin URL of the form foo' '
+ (cd relative-clone &&
+ git remote set-url origin foo
+ git submodule sync &&
+ (cd submodule &&
+ #actual fails with: "cannot strip off url foo
+ git config remote.origin.url &&
+ test "$(git config remote.origin.url)" == "../submodule"
+ )
+ )
+'
+
+test_expect_failure '"git submodule sync" handles origin URL of the form foo/bar' '
+ (cd relative-clone &&
+ git remote set-url origin foo/bar
+ git submodule sync &&
+ (cd submodule &&
+ #actual foo/submodule
+ git config remote.origin.url &&
+ test "$(git config remote.origin.url)" == "../foo/submodule"
+ )
+ )
+'
+
+test_expect_failure '"git submodule sync" handles origin URL of the form ./foo' '
+ (cd relative-clone &&
+ git remote set-url origin ./foo
+ git submodule sync &&
+ (cd submodule &&
+ #actual ./submodule
+ git config remote.origin.url &&
+ test "$(git config remote.origin.url)" == "../submodule"
+ )
+ )
+'
+
+test_expect_failure '"git submodule sync" handles origin URL of the form ./foo/bar' '
+ (cd relative-clone &&
+ git remote set-url origin ./foo/bar
+ git submodule sync &&
+ (cd submodule &&
+ #actual ./foo/submodule
+ git config remote.origin.url &&
+ test "$(git config remote.origin.url)" == "../foo/submodule"
+ )
+ )
+'
+
+test_expect_failure '"git submodule sync" handles origin URL of the form ../foo' '
+ (cd relative-clone &&
+ git remote set-url origin ../foo
+ git submodule sync &&
+ (cd submodule &&
+ #actual ../submodule
+ git config remote.origin.url &&
+ test "$(git config remote.origin.url)" == "../../submodule"
+ )
+ )
+'
+
+test_expect_failure '"git submodule sync" handles origin URL of the form ../foo/bar' '
+ (cd relative-clone &&
+ git remote set-url origin ../foo/bar
+ git submodule sync &&
+ (cd submodule &&
+ #actual ../foo/submodule
+ git config remote.origin.url &&
+ test "$(git config remote.origin.url)" == "../../foo/submodule"
+ )
+ )
+'
+
test_done
--
1.7.10.2.649.g5ca7d80
next prev parent reply other threads:[~2012-05-24 3:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-24 3:37 [PATCH v5 0/2] series: submodule: fix handling of relative superproject origin URLs Jon Seymour
2012-05-24 3:37 ` Jon Seymour [this message]
2012-05-24 3:37 ` [PATCH v5 2/2] " Jon Seymour
2012-05-24 3:40 ` Jon Seymour
2012-05-24 18:58 ` Phil Hord
2012-05-24 22:09 ` Jon Seymour
2012-05-24 23:07 ` Jon Seymour
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1337830657-16400-2-git-send-email-jon.seymour@gmail.com \
--to=jon.seymour@gmail.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).