Am 22.06.2010 11:25, schrieb Pascal Obry:
> Same patch with fixed formatting. Sorry.
>
> When using the protocol git+ssh:// for example we do not want to
> decode the '+' as a space.
>
> This fixes a regression introduced in 9d2e942.
> ---
> url.c | 9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
>
> diff --git a/url.c b/url.c
> index cd32b92..94a42a5 100644
> --- a/url.c
> +++ b/url.c
> @@ -70,9 +70,18 @@ static int url_decode_char(const char *q)
> static char *url_decode_internal(const char **query, const char *stop_at)
> {
> const char *q = *query;
> + const char *first_slash;
> struct strbuf out;
>
> strbuf_init(&out, 16);
> +
> + /* Skip protocol. */
> + first_slash = strchr(*query, '/');
> +
> + while (q < first_slash) {
> + strbuf_addch(&out, *q++);
> + }
> +
> do {
> unsigned char c = *q;
>
The protocol in an URL is followed by a colon and technically a slash
doesn't have to be part of it at all. While in practise all URL schemes
used by git have two slashes following the colon, it's just as easy to
be more correct and search for ':' instead of '/' here.
And you can use strbuf_add() instead of the while loop because you know
how many characters to copy.
René
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html