From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: Jens.Lehmann@web.de, gitster@pobox.com, phil.hord@gmail.com,
ramsay@ramsay1.demon.co.uk, Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH v7 2/9] submodule: document failure to detect invalid submodule URLs
Date: Mon, 28 May 2012 01:34:04 +1000 [thread overview]
Message-ID: <1338132851-23497-3-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <1338132851-23497-1-git-send-email-jon.seymour@gmail.com>
These tests document failures to detect submodule URLs that backtrack
past the 'invariant' part of a superproject's origin URL.
For example: if the origin URL is ssh://hostname/repo, then currently
if a submodule URL is specified as ../../subrepo, then git will
construct a submodule url of the form ssh://subrepo/ without complaint.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t7400-submodule-basic.sh | 70 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 70 insertions(+)
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 9428c7a..a758c63 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -543,10 +543,80 @@ test_expect_success '../subrepo works with helper URL- helper:://hostname/repo'
)
'
+test_expect_failure '../../subrepo fails with URL - ssh://hostname/repo' "
+ (
+ cd reltest &&
+ cp pristine-.git-config .git/config &&
+ cp pristine-.gitmodules .gitmodules &&
+ git config remote.origin.url ssh://hostname/repo &&
+ git config -f .gitmodules submodule.sub.url ../../subrepo &&
+ echo cannot strip one component off url \'ssh://hostname/\' > expected &&
+ test_must_fail git submodule init 2>actual &&
+ #actual no failure, url configured as ssh://subrepo
+ test_cmp expected actual
+ )
+"
+
+test_expect_failure '../../subrepo fails with absolute local path - /repo' "
+ (
+ cd reltest &&
+ cp pristine-.git-config .git/config &&
+ cp pristine-.gitmodules .gitmodules &&
+ git config remote.origin.url /repo &&
+ git config -f .gitmodules submodule.sub.url ../../subrepo &&
+ echo cannot strip one component off url \'/\' > expected &&
+ test_must_fail git submodule init 2>actual &&
+ test_cmp expected actual
+ )
+"
+
+test_expect_failure '../../../subrepo fails with URL - ssh://hostname/repo' "
+ (
+ cd reltest &&
+ cp pristine-.git-config .git/config &&
+ cp pristine-.gitmodules .gitmodules &&
+ git config remote.origin.url ssh://hostname/repo &&
+ git config -f .gitmodules submodule.sub.url ../../../subrepo &&
+ echo cannot strip one component off url \'ssh://hostname/\' > expected &&
+ test_must_fail git submodule init 2>actual &&
+ #actual no failure, url configured as ssh:/subrepo
+ test_cmp expected actual
+ )
+"
+
+test_expect_failure '../../../../subrepo fails with with URL - ssh://hostname/repo' "
+ (
+ cd reltest &&
+ cp pristine-.git-config .git/config &&
+ cp pristine-.gitmodules .gitmodules &&
+ git config remote.origin.url ssh://hostname/repo &&
+ git config -f .gitmodules submodule.sub.url ../../../../subrepo &&
+ echo cannot strip one component off url \'ssh://hostname/\' > expected &&
+ test_must_fail git submodule init 2>actual &&
+ #actual no failure, url configured as ssh:/subrepo
+ test_cmp expected actual
+ )
+"
+
+test_expect_failure '../../../../../subrepo fails with URL - ssh://hostname/repo' "
+ (
+ cd reltest &&
+ cp pristine-.git-config .git/config &&
+ cp pristine-.gitmodules .gitmodules &&
+ git config remote.origin.url ssh://hostname/repo &&
+ git config -f .gitmodules submodule.sub.url ../../../../../subrepo &&
+ echo cannot strip one component off url \'ssh://hostname/\' > expected &&
+ test_must_fail git submodule init 2>actual &&
+ #actual cannot strip one component off url 'ssh'
+ test_cmp expected actual
+ )
+"
+
test_expect_success '../subrepo works with scp-style URL - user@host:repo' '
(
cd reltest &&
cp pristine-.git-config .git/config &&
+ cp pristine-.gitmodules .gitmodules &&
git config remote.origin.url user@host:repo &&
git submodule init &&
test "$(git config submodule.sub.url)" = user@host:subrepo
--
1.7.10.2.656.g24a6219
next prev parent reply other threads:[~2012-05-27 15:36 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-27 15:34 [PATCH v7 0/9] submodule: improve robustness of path handling Jon Seymour
2012-05-27 15:34 ` [PATCH v7 1/9] submodule: additional regression tests for relative URLs Jon Seymour
2012-05-27 15:34 ` Jon Seymour [this message]
2012-05-27 15:34 ` [PATCH v7 3/9] submodule: document failure to handle relative superproject origin URLs Jon Seymour
2012-05-27 15:34 ` [PATCH v7 4/9] submodule: document failure to handle improperly normalized remote " Jon Seymour
2012-05-27 15:34 ` [PATCH v7 5/9] submodule: extract normalize_path into standalone function Jon Seymour
2012-05-27 15:34 ` [PATCH v7 6/9] submodule: fix detection of invalid submodule URL Jon Seymour
2012-05-28 19:01 ` Johannes Sixt
2012-05-28 21:39 ` Jon Seymour
2012-06-03 9:51 ` Jon Seymour
2012-05-27 15:34 ` [PATCH v7 7/9] submodule: fix sync handling of relative superproject origin URLs Jon Seymour
2012-05-27 15:34 ` [PATCH v7 8/9] submodule: fix handling of denormalized " Jon Seymour
2012-05-27 22:57 ` Jon Seymour
2012-05-27 15:34 ` [PATCH v7 9/9] submodule: fix normalization to handle repeated ./ Jon Seymour
2012-05-28 20:07 ` [PATCH v7 0/9] submodule: improve robustness of path handling Jens Lehmann
2012-05-28 22:01 ` Jon Seymour
2012-05-29 19:21 ` Jens Lehmann
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=1338132851-23497-3-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 \
--cc=phil.hord@gmail.com \
--cc=ramsay@ramsay1.demon.co.uk \
/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).