Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
2dfd5eae
Commit
2dfd5eae
authored
Jul 24, 2015
by
Edward Thomson
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3307 from libgit2/cmn/submodule-backslash
Normalize submodule urls before looking at them
parents
759b2230
a58854a0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
55 additions
and
0 deletions
+55
-0
src/path.c
+16
-0
src/path.h
+5
-0
src/submodule.c
+11
-0
tests/submodule/lookup.c
+23
-0
No files found.
src/path.c
View file @
2dfd5eae
...
...
@@ -1676,3 +1676,19 @@ bool git_path_isvalid(
return
verify_component
(
repo
,
start
,
(
c
-
start
),
flags
);
}
int
git_path_normalize_slashes
(
git_buf
*
out
,
const
char
*
path
)
{
int
error
;
char
*
p
;
if
((
error
=
git_buf_puts
(
out
,
path
))
<
0
)
return
error
;
for
(
p
=
out
->
ptr
;
*
p
;
p
++
)
{
if
(
*
p
==
'\\'
)
*
p
=
'/'
;
}
return
0
;
}
src/path.h
View file @
2dfd5eae
...
...
@@ -591,4 +591,9 @@ extern bool git_path_isvalid(
const
char
*
path
,
unsigned
int
flags
);
/**
* Convert any backslashes into slashes
*/
int
git_path_normalize_slashes
(
git_buf
*
out
,
const
char
*
path
);
#endif
src/submodule.c
View file @
2dfd5eae
...
...
@@ -781,11 +781,21 @@ 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
);
/* We do this in all platforms in case someone on Windows created the .gitmodules */
if
(
strchr
(
url
,
'\\'
))
{
if
((
error
=
git_path_normalize_slashes
(
&
normalized
,
url
))
<
0
)
return
error
;
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 +806,7 @@ int git_submodule_resolve_url(git_buf *out, git_repository *repo, const char *ur
error
=
-
1
;
}
git_buf_free
(
&
normalized
);
return
error
;
}
...
...
tests/submodule/lookup.c
View file @
2dfd5eae
...
...
@@ -151,6 +151,29 @@ void test_submodule_lookup__lookup_even_with_missing_index(void)
test_submodule_lookup__simple_lookup
();
/* baseline should still pass */
}
void
test_submodule_lookup__backslashes
(
void
)
{
git_config
*
cfg
;
git_submodule
*
sm
;
git_repository
*
subrepo
;
git_buf
buf
=
GIT_BUF_INIT
;
const
char
*
backslashed_path
=
"..
\\
submod2_target"
;
cl_git_pass
(
git_config_open_ondisk
(
&
cfg
,
"submod2/.gitmodules"
));
cl_git_pass
(
git_config_set_string
(
cfg
,
"submodule.sm_unchanged.url"
,
backslashed_path
));
git_config_free
(
cfg
);
cl_git_pass
(
git_submodule_lookup
(
&
sm
,
g_repo
,
"sm_unchanged"
));
cl_assert_equal_s
(
backslashed_path
,
git_submodule_url
(
sm
));
cl_git_pass
(
git_submodule_open
(
&
subrepo
,
sm
));
cl_git_pass
(
git_submodule_resolve_url
(
&
buf
,
g_repo
,
backslashed_path
));
git_buf_free
(
&
buf
);
git_submodule_free
(
sm
);
git_repository_free
(
subrepo
);
}
static
void
baseline_tests
(
void
)
{
/* small baseline that should work even if we change the index or make
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment