From: Patrick Steinhardt <ps@pks.im>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>,
git@vger.kernel.org, sunshine@sunshineco.com, pclouds@gmail.com
Subject: Re: [PATCH v4 1/3] clone: do not include authentication data in guessed dir
Date: Thu, 6 Aug 2015 11:47:32 +0200 [thread overview]
Message-ID: <20150806094732.GA746@pks-xps> (raw)
In-Reply-To: <xmqqmvy534m0.fsf@gitster.dls.corp.google.com>
[-- Attachment #1: Type: text/plain, Size: 1434 bytes --]
On Wed, Aug 05, 2015 at 12:41:27PM -0700, Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
> > For completeness, here is what I think the end result (together with
> > Peff's series) of the test should look like.
> > ...
> > Note that ssh://user:passw@rd@host:1234/ and user:passw@rd@host:/
> > tests fail for the same reason (finding @ should be greedy, I think).
>
> And I think this should make it pass. Just remember the last
> occurrence of '@' by moving the 'start' every time we see an '@'
> sign.
>
> builtin/clone.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/builtin/clone.c b/builtin/clone.c
> index cae288f..5d86439 100644
> --- a/builtin/clone.c
> +++ b/builtin/clone.c
> @@ -160,13 +160,12 @@ static char *guess_dir_name(const char *repo, int is_bundle, int is_bare)
> start += 3;
>
> /*
> - * Skip authentication data.
> + * Skip authentication data, if exists.
> */
> - ptr = start;
> - while (ptr < end && !is_dir_sep(*ptr) && *ptr != '@')
> - ptr++;
> - if (*ptr == '@')
> - start = ptr + 1;
> + for (ptr = start; ptr < end && !is_dir_sep(*ptr); ptr++) {
> + if (*ptr == '@')
> + start = ptr + 1;
> + }
>
> /*
> * Strip trailing spaces, slashes and /.git
I guess it makes sense to skip over @-signs greedily. Is there
anything I need to do here or will you squash those changes in?
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2015-08-06 9:47 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-27 11:48 [PATCH] clone: fix repo name when cloning a server's root Patrick Steinhardt
2015-07-27 12:51 ` Duy Nguyen
2015-07-27 12:59 ` Patrick Steinhardt
2015-07-27 14:29 ` Junio C Hamano
2015-07-29 15:51 ` [PATCH v2 0/6] " Patrick Steinhardt
2015-07-29 15:51 ` [PATCH v2 1/6] tests: fix broken && chains in t1509-root-worktree Patrick Steinhardt
2015-07-29 15:51 ` [PATCH v2 2/6] tests: fix cleanup after tests " Patrick Steinhardt
2015-07-29 15:51 ` [PATCH v2 3/6] connect: expose parse_connect_url() Patrick Steinhardt
2015-07-29 15:51 ` [PATCH v2 4/6] connect: move error check to caller of parse_connect_url Patrick Steinhardt
2015-07-29 20:32 ` Eric Sunshine
2015-07-30 12:19 ` Patrick Steinhardt
2015-07-29 15:51 ` [PATCH v2 5/6] clone: fix hostname parsing when guessing dir Patrick Steinhardt
2015-07-29 17:42 ` Junio C Hamano
2015-07-30 12:18 ` Patrick Steinhardt
2015-07-30 16:30 ` Junio C Hamano
2015-07-30 16:53 ` Junio C Hamano
2015-08-03 8:34 ` Patrick Steinhardt
2015-08-03 16:37 ` Jeff King
2015-08-03 19:43 ` Junio C Hamano
2015-07-29 15:51 ` [PATCH v2 6/6] clone: add tests for cloning with empty path Patrick Steinhardt
2015-07-30 18:18 ` Eric Sunshine
2015-07-31 0:58 ` Junio C Hamano
2015-07-31 8:45 ` Patrick Steinhardt
2015-08-04 11:29 ` [PATCH v3 0/6] fix repo name when cloning a server's root Patrick Steinhardt
2015-08-04 11:29 ` [PATCH v3 1/6] tests: fix broken && chains in t1509-root-worktree Patrick Steinhardt
2015-08-04 11:29 ` [PATCH v3 2/6] tests: fix cleanup after tests " Patrick Steinhardt
2015-08-04 11:29 ` [PATCH v3 3/6] clone: do not include authentication data in guessed dir Patrick Steinhardt
2015-08-04 11:29 ` [PATCH v3 4/6] clone: do not use port number as dir name Patrick Steinhardt
2015-08-04 11:29 ` [PATCH v3 5/6] clone: abort if no dir name could be guessed Patrick Steinhardt
2015-08-04 11:29 ` [PATCH v3 6/6] clone: add tests for cloning with empty path Patrick Steinhardt
2015-08-04 18:37 ` Eric Sunshine
2015-08-05 17:34 ` [PATCH v3 0/6] fix repo name when cloning a server's root Junio C Hamano
2015-08-05 21:19 ` Jeff King
2015-08-06 7:22 ` Torsten Bögershausen
2015-08-06 8:00 ` Junio C Hamano
2015-08-05 10:06 ` [PATCH v4 0/3] " Patrick Steinhardt
2015-08-05 10:06 ` [PATCH v4 1/3] clone: do not include authentication data in guessed dir Patrick Steinhardt
2015-08-05 17:43 ` Junio C Hamano
2015-08-05 19:36 ` Junio C Hamano
2015-08-05 19:41 ` Junio C Hamano
2015-08-06 9:47 ` Patrick Steinhardt [this message]
2015-08-07 20:45 ` Junio C Hamano
2015-08-08 17:37 ` Patrick Steinhardt
2015-08-05 10:06 ` [PATCH v4 2/3] clone: do not use port number as dir name Patrick Steinhardt
2015-08-05 10:06 ` [PATCH v4 3/3] clone: abort if no dir name could be guessed Patrick Steinhardt
2015-08-05 17:44 ` Junio C Hamano
2015-08-10 15:48 ` [PATCH v5 0/5] Improve guessing of repository names Patrick Steinhardt
2015-08-10 15:48 ` [PATCH v5 1/5] clone: add tests for output directory Patrick Steinhardt
2015-08-10 15:48 ` [PATCH v5 2/5] clone: use computed length in guess_dir_name Patrick Steinhardt
2015-08-10 15:48 ` [PATCH v5 3/5] clone: do not include authentication data in guessed dir Patrick Steinhardt
2015-08-10 15:48 ` [PATCH v5 4/5] clone: do not use port number as dir name Patrick Steinhardt
2015-08-10 15:48 ` [PATCH v5 5/5] clone: abort if no dir name could be guessed Patrick Steinhardt
2015-08-10 18:07 ` [PATCH v5 0/5] Improve guessing of repository names 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=20150806094732.GA746@pks-xps \
--to=ps@pks.im \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.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).