Merge pull request gitextensions#9305 from mdonatas/path-util-fix

mdonatas · Jun 27, 2021 · f0fe571 · f0fe571
2 parents a727559 + a7939c1
commit f0fe571
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/GitCommands/PathUtil.cs b/GitCommands/PathUtil.cs
@@ -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;

diff --git a/UnitTests/GitCommands.Tests/FullPathResolverTests.cs b/UnitTests/GitCommands.Tests/FullPathResolverTests.cs
diff --git a/UnitTests/GitCommands.Tests/Helpers/PathUtilTest.cs b/UnitTests/GitCommands.Tests/Helpers/PathUtilTest.cs
@@ -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)
         {