From: Jon Seymour <jon.seymour@gmail.com>
To: Jens Lehmann <Jens.Lehmann@web.de>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH 2/2] submodule: fix handling of supermodules with relative origin URLs
Date: Sun, 20 May 2012 08:51:08 +1000 [thread overview]
Message-ID: <CAH3AnrrqiXqdHHGZPyOPJ3Zend5JrQX0rKV+pz_mjs3SDjv9DA@mail.gmail.com> (raw)
In-Reply-To: <4FB7ECCF.9020403@web.de>
On Sun, May 20, 2012 at 4:56 AM, Jens Lehmann <Jens.Lehmann@web.de> wrote:
> Am 19.05.2012 06:40, schrieb Jon Seymour:
>
> Just a small nit: I'd prefer to replace the 4 occurrences of the term
> "supermodule" with "superproject".
Sure. I can't argue with precedent, of course, but I guess I was
favouring the consistency in the suffixes used with sub and super.
>
>
> BTW, what happened to the following comment in you other email?
>
>>> + remoteurl="${up_path%/}/${remoteurl%/*}"
>>
>> Meant up_path%/ to be up_path%/*
>
> The '*' is not there (but the test suite runs fine no matter if I add
> a '*' there or not). Thinking about it not adding the '*' should be
> correct, as you just want to chop off a trailing '/' from $up_path
> here, right?
Yes %/* was actually the wrong thing to do - my original intent was to
remove repeated trailing occurrences of /, but, of course, %/* doesn't
do that, nor should it be necessary (assuming the sm_path was
normalized during add).
>
> So no objection on the code changes from my side.
I noticed one relative case that is not handled properly yet, but
there is a workaround. If the superproject's origin URL is of the
form: foo/bar (a case I actually have myself for reasons I can explain
if you want me to), then the correct rule doesn't get matched by
.*/*). The workaround is for the user to change foo/bar style origin
URLs to ./foo/bar.
Let me know if I should fix this case now too.
jon.
next prev parent reply other threads:[~2012-05-19 22:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-19 4:40 [PATCH 1/2] submodule: add tests for add,sync,init in presence of relative super origin URL Jon Seymour
2012-05-19 4:40 ` [PATCH 2/2] submodule: fix handling of supermodules with relative origin URLs Jon Seymour
2012-05-19 18:56 ` Jens Lehmann
2012-05-19 22:51 ` Jon Seymour [this message]
2012-05-19 23:10 ` Jon Seymour
2012-05-19 23:45 ` Jon Seymour
2012-05-20 0:34 ` Jens Lehmann
2012-05-20 1:25 ` Jon Seymour
2012-05-20 5:16 ` Junio C Hamano
2012-05-20 13:28 ` [PATCH] Consistently use "superproject" instead of "supermodule" 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=CAH3AnrrqiXqdHHGZPyOPJ3Zend5JrQX0rKV+pz_mjs3SDjv9DA@mail.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).