Escape quotations when quoting filenames

gitextensions · Nov 8, 2020 · bda7376 · bda7376
1 parent a3e88ac
commit bda7376
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 18 deletions.
diff --git a/GitCommands/StringExtensions.cs b/GitCommands/StringExtensions.cs
@@ -179,18 +179,18 @@ public static string Combine([CanBeNull] this string left, [NotNull] string sep,
         }
 
         /// <summary>
-        /// Quotes this string with the specified <paramref name="quotationMark"/>
+        /// Quotes this string with the specified <paramref name="q"/>
         /// </summary>
         [Pure]
         [NotNull]
-        public static string Quote([CanBeNull] this string s, [NotNull] string quotationMark = "\"")
+        public static string Quote([CanBeNull] this string s, [NotNull] string q = "\"")
         {
             if (s == null)
             {
                 return "";
             }
 
-            return quotationMark + s + quotationMark;
+            return $"{q}{s.Replace(q, "\\" + q)}{q}";
         }
 
         /// <summary>

diff --git a/UnitTests/GitCommands.Tests/Config/ConfigFileTest.cs b/UnitTests/GitCommands.Tests/Config/ConfigFileTest.cs
@@ -54,27 +54,16 @@ private static string GetDefaultConfigFileContent()
             return content.ToString();
         }
 
-        private void AddConfigValue(string cfgFile, string section, string value)
-        {
-            var args = new GitArgumentBuilder("config")
-            {
-                "-f",
-                cfgFile.Quote(),
-                "--add",
-                section,
-                value
-            };
-            Module.GitExecutable.GetOutput(args);
-        }
-
         private string GetConfigValue(string cfgFile, string key)
         {
             var args = new GitArgumentBuilder("config")
             {
                 "-f",
                 cfgFile.Quote(),
                 "--get",
-                key.Quote()
+
+                // Quote the key without unescaping internal quotes
+                $"\"{key}\""
             };
             return Module.GitExecutable.GetOutput(args).TrimEnd('\n');
         }

diff --git a/UnitTests/GitCommands.Tests/EnvironmentPathsProviderTests.cs b/UnitTests/GitCommands.Tests/EnvironmentPathsProviderTests.cs
@@ -41,7 +41,7 @@ public void GetEnvironmentValidPaths()
         public void GetEnvironmentValidPaths_quoted()
         {
             var paths = GetValidPaths().Concat(GetInvalidPaths());
-            var quotedPaths = paths.Select(path => path.Quote(" ")).Select(path => path.Quote());
+            var quotedPaths = paths.Select(path => path.Quote());
             string pathVariable = string.Join(_separator, quotedPaths);
             _environment.GetEnvironmentVariable("PATH").Returns(pathVariable);