From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: j6t@kdbg.org, Johannes.Schindelin@gmx.de, git@vger.kernel.org,
venv21@gmail.com, dennis@kaarsemaker.net, jrnieder@gmail.com
Subject: Re: [PATCH] submodule--helper: normalize funny urls
Date: Tue, 18 Oct 2016 08:24:20 -0700 [thread overview]
Message-ID: <xmqqy41lr87v.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20161017221623.7299-1-sbeller@google.com> (Stefan Beller's message of "Mon, 17 Oct 2016 15:16:23 -0700")
Stefan Beller <sbeller@google.com> writes:
> Currently a URL for the superproject ending in
>
> (A) .../path/to/dir
> (B) .../path/to/dir/
> (C) .../path/to/dir/.
> (D) .../path/to/dir/./.
> (E) .../path/to/dir/.///.//.
>
> is treated the same in (A) and (B), but (C, D, E) are different.
You may know what you meant to say with "treated", but the readers
do not know "treated" in what situation you are talking about. We
need to tell the readers that the bug being fixed is about resolving
a relative URL "../<something>" off of the URL of the superproject
to compute the remote URL for a submodule repository.
> We never produce the URLs in (C,D,E) ourselves, they come to use, because
> the user used it as the URL for cloning a superproject.
> Normalize these paths.
As you know the externally-visible impact of this change (which I
asked you, but didn't see an on-list answer to, by the way), please
describe what this means to the end user in the log message. It is
normally done in an earlier part of the log message to describe the
problem being solved and its background.
If I understand the issue correctly, it may go like this:
The remote URL for the submodule can be specified relative
to the URL of the superproject in .gitmodules. A top-level
git://site.xz/toplevel.git can specify in its .gitmodules
[submodule "sub"]
url = ../submodule.git
path = sub
to say that git://site.xz/submodule.git is where the
submodule bound at its "sub/" is found.
However, when the toplevel is cloned like this:
git clone git://site.xz/toplevel.git/. top
i.e. the toplevel specifies its URL with trailing "/.", the
code set the URL to git://site.xz/toplevel.git/submodule.git
for the submodule, which is nonsense. This was because the
logic failed to treat trailing "/." any differently from
trailing "/<anything-without-slash>" when resolving a
relative URL "../<something>" off of it. Stripping "/." at
the end does *not* take you one level up, even though
stripping "/<anything-without-slash>" does!
And then describe the solution/bugfix, listing A-C (or A-E) and
telling that these will be treated the same way.
next prev parent reply other threads:[~2016-10-18 15:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-17 22:16 [PATCH] submodule--helper: normalize funny urls Stefan Beller
2016-10-17 22:49 ` Junio C Hamano
2016-10-17 22:50 ` Stefan Beller
2016-10-18 11:23 ` Johannes Schindelin
2016-10-18 17:15 ` Junio C Hamano
2016-10-18 17:17 ` Stefan Beller
2016-10-18 17:51 ` Junio C Hamano
2016-10-18 15:24 ` Junio C Hamano [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-10-18 17:52 Stefan Beller
2016-10-18 19:49 ` Junio C Hamano
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=xmqqy41lr87v.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=dennis@kaarsemaker.net \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=jrnieder@gmail.com \
--cc=sbeller@google.com \
--cc=venv21@gmail.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).