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 v3 1/4] submodule: verify support for superproject origin URLs of the form ./foo/bar or ../foo/bar
Date: Mon, 21 May 2012 23:31:39 +1000 [thread overview]
Message-ID: <1337607102-14737-1-git-send-email-jon.seymour@gmail.com> (raw)
These tests are expected to fail, pending a subsequent corrective patch.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t7400-submodule-basic.sh | 26 ++++++++++++++++++++++++++
t/t7403-submodule-sync.sh | 10 ++++++++++
2 files changed, 36 insertions(+)
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 81827e6..02e6428 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -507,6 +507,32 @@ test_expect_success 'relative path works with user@host:path' '
)
'
+test_expect_failure 'relative path works with ../relative/repo' '
+ (
+ cd reltest &&
+ cp pristine-.git-config .git/config &&
+ git config remote.origin.url ../relative/repo &&
+ git submodule init &&
+ test "$(git config submodule.sub.url)" = ../../relative/subrepo
+ )
+'
+
+test_expect_failure 'test that submodule add creates the correct url when super origin url is ../relative/repo' '
+ mkdir reladd &&
+ (
+ cd reladd &&
+ git init &&
+ git remote add origin ../relative/repo
+ mkdir sub &&
+ (
+ cd sub &&
+ git init &&
+ test_commit foo
+ ) &&
+ git submodule add ../subrepo ./sub &&
+ test "$(git config submodule.sub.url)" = ../../relative/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..788bc24 100755
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@ -86,4 +86,14 @@ test_expect_success '"git submodule sync" should not vivify uninteresting submod
)
'
+test_expect_failure '"git submodule sync" should handle a super with a relative origin URL' '
+ git clone super relative-clone &&
+ (cd relative-clone &&
+ git submodule update --init &&
+ git remote set-url origin ../relative/super.git &&
+ git submodule sync &&
+ test "$(git config submodule.submodule.url)" == ../../relative/moved-submodule
+ )
+'
+
test_done
--
1.7.10.2.594.g5c52315
next reply other threads:[~2012-05-21 13:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-21 13:31 Jon Seymour [this message]
2012-05-21 13:31 ` [PATCH v3 2/4] submodule: support superproject origin URLs of the form ./foo/bar or ../foo/bar Jon Seymour
2012-05-21 16:35 ` Jon Seymour
2012-05-21 22:20 ` Jon Seymour
2012-05-21 13:31 ` [PATCH v3 3/4] submodule: verify support for superproject URLs of the form foo/bar Jon Seymour
2012-05-21 13:31 ` [PATCH v3 4/4] submodule: support superproject origin " 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1337607102-14737-1-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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).