[PATCH 2/2] decode file:// and ssh:// URLs
- From
Jeff King <peff@peff.net>
- Date
- May 23, 2010, 09:19 UTC
- Message-ID
- <20100523091944.GB16520@coredump.intra.peff.net>
- In-Reply-To
- <20100523091612.GB26123@coredump.intra.peff.net>
We generally treat these as equivalent to "/path/to/repo" and "host:path_to_repo" respectively. However, they are URLs and as such may be percent-encoded. The current code simply uses them as-is without any decoding.
With this patch, we will now percent-decode any file:// or ssh:// url (or ssh+git, git+ssh, etc) at the transport layer. We continue to treat plain paths and "host:path" syntax literally.
Signed-off-by: Jeff King <peff@peff.net> --- I think this also impacts git:// URLs. Which I is probably a good thing, but I haven't looked extensively for unexpected fallouts.
connect.c | 8 +++++++- t/t5601-clone.sh | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/connect.c b/connect.c index 9ae991a..0119bd3 100644 --- a/connect.c +++ b/connect.c @@ -5,6 +5,7 @@ #include "refs.h" #include "run-command.h" #include "remote.h" +#include "url.h" static char *server_capabilities; @@ -450,7 +451,7 @@ static struct child_process no_fork; struct child_process *git_connect(int fd[2], const char *url_orig, const char *prog, int flags) { - char *url = xstrdup(url_orig); + char *url; char *host, *path; char *end; int c; @@ -466,6 +467,11 @@ struct child_process *git_connect(int fd[2], const char *url_orig, */ signal(SIGCHLD, SIG_DFL); + if (is_url(url_orig)) + url = url_decode(url_orig); + else + url = xstrdup(url_orig); + host = strstr(url, "://"); if (host) { *host = '\0'; diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh index 678cee5..8abb71a 100755 --- a/t/t5601-clone.sh +++ b/t/t5601-clone.sh @@ -176,4 +176,16 @@ test_expect_success 'clone respects global branch.autosetuprebase' ' ) ' +test_expect_success 'respect url-encoding of file://' ' + git init x+y && + test_must_fail git clone "file://$PWD/x+y" xy-url && + git clone "file://$PWD/x%2By" xy-url +' + +test_expect_success 'do not respect url-encoding of non-url path' ' + git init x+y && + test_must_fail git clone x%2By xy-regular && + git clone x+y xy-regular +' + test_done
-- 1.7.1.356.gc7d3.dirty