Skip to content
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

Jump to bottom

Fix PathUtil handling of spaces in file names #9305

Merged
merged 2 commits into from
Jun 27, 2021
Merged

Fix PathUtil handling of spaces in file names #9305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13c7630
Fix PathUtil handling of spaces in file names
mdonatas Jun 18, 2021
a7939c1
Reduce long path test-case path
mdonatas Jun 25, 2021
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
3 changes: 2 additions & 1 deletion GitCommands/PathUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ private static string ResolveRelativePath(string path, string relativePath)
Uri tempPath = new(path);
if (!string.IsNullOrEmpty(relativePath))
{
tempPath = new Uri(tempPath, relativePath);
tempPath = new Uri(tempPath, Uri.EscapeUriString(relativePath));
return Uri.UnescapeDataString(tempPath.LocalPath);
}

return tempPath.LocalPath;
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/GitCommands.Tests/FullPathResolverTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions UnitTests/GitCommands.Tests/Helpers/PathUtilTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ public void Resolve(string path, string expected)
}

[TestCase(@"C:\WORK\", @"GitExtensions\", @"C:\WORK\GitExtensions\")]
[TestCase(@"C:\WORK\", @" file .txt ", @"C:\WORK\ file .txt ")]
[TestCase(@"\\wsl$\", @"Ubuntu\home\jack\work\", @"\\wsl$\Ubuntu\home\jack\work\")]
public void Resolve(string path, string relativePath, string expected)
{
Expand Down