Commit 55bc1351 by Carlos Martín Nieto

submodule: normalize slashes in resolve_url

Our path functions expect to work with slashes, so convert a
path with backslashes into one with slashes at the top of
the function.
parent a89a756d
......@@ -781,11 +781,25 @@ const char *git_submodule_url(git_submodule *submodule)
int git_submodule_resolve_url(git_buf *out, git_repository *repo, const char *url)
{
int error = 0;
git_buf normalized = GIT_BUF_INIT;
assert(out && repo && url);
git_buf_sanitize(out);
if (strchr(url, '\\')) {
char *p;
if ((error = git_buf_puts(&normalized, url)) < 0)
return error;
for (p = normalized.ptr; *p; p++) {
if (*p == '\\')
*p = '/';
}
url = normalized.ptr;
}
if (git_path_is_relative(url)) {
if (!(error = get_url_base(out, repo)))
error = git_path_apply_relative(out, url);
......@@ -796,6 +810,7 @@ int git_submodule_resolve_url(git_buf *out, git_repository *repo, const char *ur
error = -1;
}
git_buf_free(&normalized);
return error;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment