From: Jonathan Nieder <jrnieder@gmail.com>
To: Thomas Rast <trast@student.ethz.ch>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Mark Levedahl <mlevedahl@gmail.com>,
Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Subject: Re: [PATCH] submodule: fix relative url parsing for scp-style origin
Date: Mon, 10 Jan 2011 10:48:01 -0600 [thread overview]
Message-ID: <20110110164801.GA7714@burratino> (raw)
In-Reply-To: <7a578ef3384a891cebd4a39421302983499771e0.1294655635.git.trast@student.ethz.ch>
Thomas Rast wrote:
> The function resolve_relative_url was not prepared to deal with an
> scp-style origin 'user@host:path' in the case where 'path' is only a
> single component. Fix this by extending the logic that strips one
> path component from the $remoteurl.
The above description does not mention that the relative URL in
question is "../otherpath". Anyway, I think it's a great idea; thanks
for doing it!
> --- a/git-submodule.sh
> +++ b/git-submodule.sh
[...]
> @@ -37,12 +37,24 @@ resolve_relative_url ()
[...]
> - remoteurl="${remoteurl%/*}"
> + case "$remoteurl" in
> + */*)
> + remoteurl="${remoteurl%/*}"
> + ;;
> + *:*)
> + remoteurl="${remoteurl%:*}"
> + sep=:
> + ;;
What happens to
url = ssh://example.com:1234
url = ftp://ftp.example.com
url = /local/path/with/a/colon:in:it
url = git://example.com/path/with/a/colon:in:it
> + *)
> + die "cannot strip one component off url '$remoteurl'"
> + ;;
url = simple.subdir.of.cwd
? (Not a rhetorical question; I'm only curious. If the ftp example
is valid then the existing code already would not cope well with it.)
> --- a/t/t7400-submodule-basic.sh
> +++ b/t/t7400-submodule-basic.sh
Nice.
next prev parent reply other threads:[~2011-01-10 16:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-10 10:37 [PATCH] submodule: fix relative url parsing for scp-style origin Thomas Rast
2011-01-10 16:48 ` Jonathan Nieder [this message]
2011-01-10 17:05 ` Thomas Rast
2011-01-10 17:22 ` Jonathan Nieder
2011-01-10 18:18 ` Thomas Rast
2011-01-10 17:01 ` Junio C Hamano
2011-01-11 2:59 ` Mark Levedahl
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=20110110164801.GA7714@burratino \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jeffrey.freeman@syncleus.com \
--cc=mlevedahl@gmail.com \
--cc=trast@student.ethz.ch \
/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).