Skip to content

Win32 path canonicalization refactoring #4852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ethomson merged 5 commits into from
Oct 20, 2018
Merged

Win32 path canonicalization refactoring #4852

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ab11dd
Fix issue with path canonicalization for Win32 paths
GabeDeBacker Sep 30, 2018
3f096ca
Fix comment style and update test code
GabeDeBacker Oct 4, 2018
b2e85f9
win32: rename `git_win32__canonicalize_path`
ethomson Oct 17, 2018
16fd9ba
win32: more tests for `git_win32_remove_path`
ethomson Oct 17, 2018
a34f5b0
win32: refactor `git_win32_path_remove_namespace`
ethomson Oct 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix comment style and update test code
  • Loading branch information
@GabeDeBacker
GabeDeBacker committed Oct 4, 2018
commit 3f096ca56affd4870f6c3a5c1c045d2fb100de0d
11 changes: 7 additions & 4 deletions tests/path/win32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ void test_path_win32__absolute_from_relative(void)
#endif
}

void test_canonicalize(const wchar_t *in, const wchar_t *expected)
void static test_canonicalize(const wchar_t *in, const wchar_t *expected)
{
#ifdef GIT_WIN32
git_win32_path canonical;
Expand All @@ -145,7 +145,7 @@ void test_canonicalize(const wchar_t *in, const wchar_t *expected)
#endif
}

void test_path_git_win32__canonicalize_path(const wchar_t *in, const wchar_t *expected)
void static test_canonicalize_path(const wchar_t *in, const wchar_t *expected)
{
#ifdef GIT_WIN32
git_win32_path canonical;
Expand All @@ -161,6 +161,11 @@ void test_path_git_win32__canonicalize_path(const wchar_t *in, const wchar_t *ex
#endif
}

void test_path_win32__canonicalize_path(void)
{
test_canonicalize_path(L"\\\\?\\UNC\\server\\C$\\folder", L"\\\\server\\C$\\folder");
}

void test_path_win32__canonicalize(void)
{
#ifdef GIT_WIN32
Expand Down Expand Up @@ -202,8 +207,6 @@ void test_path_win32__canonicalize(void)
test_canonicalize(L"\\\\server\\\\share\\\\foo\\\\bar", L"\\\\server\\share\\foo\\bar");
test_canonicalize(L"\\\\server\\share\\..\\foo", L"\\\\server\\foo");
test_canonicalize(L"\\\\server\\..\\..\\share\\.\\foo", L"\\\\server\\share\\foo");

test_path_git_win32__canonicalize_path(L"\\\\?\\UNC\\server\\C$\\folder", L"\\\\server\\C$\\folder");
#endif
}

Expand Down