From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: Jens.Lehmann@web.de, gitster@pobox.com,
Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH v2 1/2] submodule: add tests for add,sync,init in presence of relative super origin URL
Date: Sun, 20 May 2012 09:00:27 +1000 [thread overview]
Message-ID: <1337468428-26155-1-git-send-email-jon.seymour@gmail.com> (raw)
These tests are expected to fail, pending subsequent patch.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t7400-submodule-basic.sh | 27 +++++++++++++++++++++++++++
t/t7403-submodule-sync.sh | 10 ++++++++++
2 files changed, 37 insertions(+)
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 81827e6..1c40951 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -507,6 +507,33 @@ 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' '
+ 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.650.g22d2504
next reply other threads:[~2012-05-19 23:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-19 23:00 Jon Seymour [this message]
2012-05-19 23:00 ` [PATCH v2 2/2] submodule: fix handling of superproject with relative origin URLs Jon Seymour
2012-05-21 2:08 ` Junio C Hamano
2012-05-21 13:52 ` 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=1337468428-26155-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.
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).