Merge pull request libgit2#5187 from ianhattendorf/fix/clone-whitespace

ethomson · web-flow · commit 0f40e68e2f46 · 2019-08-14T09:05:07.000+01:00
clone: don't decode URL percent encodings
diff --git a/src/net.c b/src/net.c
@@ -94,7 +94,7 @@ int git_net_url_parse(git_net_url *url, const char *given)
 	if (has_path) {
 		const char *url_path = given + u.field_data[UF_PATH].off;
 		size_t url_path_len = u.field_data[UF_PATH].len;
-		git_buf_decode_percent(&path, url_path, url_path_len);
+		git_buf_put(&path, url_path, url_path_len);
 	} else {
 		git_buf_puts(&path, "/");
 	}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -69,5 +69,5 @@ ADD_CLAR_TEST(offline   -v -xonline)
 ADD_CLAR_TEST(invasive  -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
 ADD_CLAR_TEST(online    -v -sonline)
 ADD_CLAR_TEST(gitdaemon -v -sonline::push)
-ADD_CLAR_TEST(ssh       -v -sonline::push -sonline::clone::ssh_cert -sonline::clone::ssh_with_paths)
+ADD_CLAR_TEST(ssh       -v -sonline::push -sonline::clone::ssh_cert -sonline::clone::ssh_with_paths -sonline::clone::path_whitespace_ssh)
 ADD_CLAR_TEST(proxy     -v -sonline::clone::proxy)
diff --git a/tests/online/clone.c b/tests/online/clone.c
@@ -863,3 +863,9 @@ void test_online_clone__proxy_cred_callback_after_failed_url_creds(void)
 
 	git_buf_dispose(&url);
 }
+
+void test_online_clone__path_whitespace(void)
+{
+	cl_git_pass(git_clone(&g_repo, "https://libgit2@dev.azure.com/libgit2/test/_git/spaces%20in%20the%20name", "./foo", &g_options));
+	cl_assert(git_path_exists("./foo/master.txt"));
+}

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ int git_net_url_parse(git_net_url url, const char given)`
`94`	`94`	`if (has_path) {`
`95`	`95`	`const char *url_path = given + u.field_data[UF_PATH].off;`
`96`	`96`	`size_t url_path_len = u.field_data[UF_PATH].len;`
`97`		`- git_buf_decode_percent(&path, url_path, url_path_len);`
	`97`	`+ git_buf_put(&path, url_path, url_path_len);`
`98`	`98`	`} else {`
`99`	`99`	`git_buf_puts(&path, "/");`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -863,3 +863,9 @@ void test_online_clone__proxy_cred_callback_after_failed_url_creds(void)`
`863`	`863`
`864`	`864`	`git_buf_dispose(&url);`
`865`	`865`	`}`
	`866`	`+`
	`867`	`+void test_online_clone__path_whitespace(void)`
	`868`	`+{`
	`869`	`+ cl_git_pass(git_clone(&g_repo, "https://[email protected]/libgit2/test/_git/spaces%20in%20the%20name", "./foo", &g_options));`
	`870`	`+ cl_assert(git_path_exists("./foo/master.txt"));`
	`871`	`+}`