Commit f00f005bad3d27bb5c23ae5d7187622b940c5d0e
2015-07-13T09:08:32
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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
diff --git a/src/submodule.c b/src/submodule.c
index fb3d4bf..e4469ef 100644
--- a/src/submodule.c
+++ b/src/submodule.c
@@ -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;
}