fix: escape double quotes in quoted git command strings (#1559)

Author: NathanBaulch

src/Commands/Add.cs

@@ -13,14 +13,14 @@ public Add(string repo, Models.Change change)
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"add -- \"{change.Path}\"";
+            Args = $"add -- {change.Path.Quoted()}";
         }
 
         public Add(string repo, string pathspecFromFile)
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"add --pathspec-from-file=\"{pathspecFromFile}\"";
+            Args = $"add --pathspec-from-file={pathspecFromFile.Quoted()}";
         }
     }
 }

src/Commands/Apply.cs

@@ -13,7 +13,7 @@ public Apply(string repo, string file, bool ignoreWhitespace, string whitespaceM
                 Args += $"--whitespace={whitespaceMode} ";
             if (!string.IsNullOrEmpty(extra))
                 Args += $"{extra} ";
-            Args += $"\"{file}\"";
+            Args += $"{file.Quoted()}";
         }
     }
 }

src/Commands/Archive.cs

@@ -6,7 +6,7 @@ public Archive(string repo, string revision, string saveTo)
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"archive --format=zip --verbose --output=\"{saveTo}\" {revision}";
+            Args = $"archive --format=zip --verbose --output={saveTo.Quoted()} {revision}";
         }
     }
 }

src/Commands/AssumeUnchanged.cs

@@ -8,7 +8,7 @@ public AssumeUnchanged(string repo, string file, bool bAdd)
 
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"update-index {mode} -- \"{file}\"";
+            Args = $"update-index {mode} -- {file.Quoted()}";
         }
     }
 }

src/Commands/Blame.cs

@@ -14,7 +14,7 @@ public Blame(string repo, string file, string revision)
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"blame -t {revision} -- \"{file}\"";
+            Args = $"blame -t {revision} -- {file.Quoted()}";
             RaiseError = false;
 
             _result.File = file;

src/Commands/Checkout.cs

@@ -51,11 +51,7 @@ public async Task<bool> UseTheirsAsync(List<string> files)
             var builder = new StringBuilder();
             builder.Append("checkout --theirs --");
             foreach (var f in files)
-            {
-                builder.Append(" \"");
-                builder.Append(f);
-                builder.Append("\"");
-            }
+                builder.Append(' ').Append(f.Quoted());
             Args = builder.ToString();
             return await ExecAsync().ConfigureAwait(false);
         }
@@ -65,19 +61,15 @@ public async Task<bool> UseMineAsync(List<string> files)
             var builder = new StringBuilder();
             builder.Append("checkout --ours --");
             foreach (var f in files)
-            {
-                builder.Append(" \"");
-                builder.Append(f);
-                builder.Append("\"");
-            }
+                builder.Append(' ').Append(f.Quoted());
 
             Args = builder.ToString();
             return await ExecAsync().ConfigureAwait(false);
         }
 
         public async Task<bool> FileWithRevisionAsync(string file, string revision)
         {
-            Args = $"checkout --no-overlay {revision} -- \"{file}\"";
+            Args = $"checkout --no-overlay {revision} -- {file.Quoted()}";
             return await ExecAsync().ConfigureAwait(false);
         }
     }

src/Commands/Command.cs

@@ -187,8 +187,8 @@ private ProcessStartInfo CreateGitStartInfo(bool redirect)
             // Force using this app as git editor.
             start.Arguments += Editor switch
             {
-                EditorType.CoreEditor => $"""-c core.editor="\"{selfExecFile}\" --core-editor" """,
-                EditorType.RebaseEditor => $"""-c core.editor="\"{selfExecFile}\" --rebase-message-editor" -c sequence.editor="\"{selfExecFile}\" --rebase-todo-editor" -c rebase.abbreviateCommands=true """,
+                EditorType.CoreEditor => $"""-c core.editor="{selfExecFile.Quoted()} --core-editor" """,
+                EditorType.RebaseEditor => $"""-c core.editor="{selfExecFile.Quoted()} --rebase-message-editor" -c sequence.editor="{selfExecFile.Quoted()} --rebase-todo-editor" -c rebase.abbreviateCommands=true """,
                 _ => "-c core.editor=true ",
             };
 

src/Commands/Commit.cs

@@ -12,7 +12,7 @@ public Commit(string repo, string message, bool signOff, bool amend, bool resetA
 
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"commit --allow-empty --file=\"{_tmpFile}\"";
+            Args = $"commit --allow-empty --file={_tmpFile.Quoted()}";
             if (signOff)
                 Args += " --signoff";
             if (amend)

src/Commands/CompareRevisions.cs

@@ -27,7 +27,7 @@ public CompareRevisions(string repo, string start, string end, string path)
             Context = repo;
 
             var based = string.IsNullOrEmpty(start) ? "-R" : start;
-            Args = $"diff --name-status {based} {end} -- \"{path}\"";
+            Args = $"diff --name-status {based} {end} -- {path.Quoted()}";
         }
 
         public async Task<List<Models.Change>> ReadAsync()

src/Commands/Config.cs

@@ -55,7 +55,7 @@ public async Task<bool> SetAsync(string key, string value, bool allowEmpty = fal
             if (!allowEmpty && string.IsNullOrWhiteSpace(value))
                 Args = $"config {scope} --unset {key}";
             else
-                Args = $"config {scope} {key} \"{value}\"";
+                Args = $"config {scope} {key} {value.Quoted()}";
 
             return await ExecAsync().ConfigureAwait(false);
         }