refactor: use git reset HEAD --pathspec-from-file=<pathspec> instead of git restore --staged --pathspec-from-file=<pathspec> to unstage files

Signed-off-by: leo <[email protected]>

Author: love-linger

src/Commands/Discard.cs

@@ -86,7 +86,7 @@ public static async Task ChangesAsync(string repo, List<Models.Change> changes,
             {
                 var pathSpecFile = Path.GetTempFileName();
                 await File.WriteAllLinesAsync(pathSpecFile, restores).ConfigureAwait(false);
-                await new Restore(repo, pathSpecFile, false).Use(log).ExecAsync().ConfigureAwait(false);
+                await new Restore(repo, pathSpecFile).Use(log).ExecAsync().ConfigureAwait(false);
                 File.Delete(pathSpecFile);
             }
         }

src/Commands/Reset.cs

@@ -8,5 +8,12 @@ public Reset(string repo, string revision, string mode)
             Context = repo;
             Args = $"reset {mode} {revision}";
         }
+
+        public Reset(string repo, string pathspec)
+        {
+            WorkingDirectory = repo;
+            Context = repo;
+            Args = $"reset HEAD --pathspec-from-file={pathspec.Quoted()}";
+        }
     }
 }

src/Commands/Restore.cs

@@ -1,20 +1,12 @@
-using System.Text;
-
-namespace SourceGit.Commands
+namespace SourceGit.Commands
 {
     public class Restore : Command
     {
-        public Restore(string repo, string pathspecFile, bool isStaged)
+        public Restore(string repo, string pathspecFile)
         {
             WorkingDirectory = repo;
             Context = repo;
-
-            var builder = new StringBuilder();
-            builder.Append("restore --progress ");
-            builder.Append(isStaged ? "--staged " : "--worktree --recurse-submodules ");
-            builder.Append("--pathspec-from-file=").Append(pathspecFile.Quoted());
-
-            Args = builder.ToString();
+            Args = $"restore --progress --worktree --recurse-submodules --pathspec-from-file={pathspecFile.Quoted()}";
         }
     }
 }

src/ViewModels/WorkingCopy.cs

@@ -393,7 +393,7 @@ public async Task UnstageChangesAsync(List<Models.Change> changes, Models.Change
                     }
                 }
 
-                await new Commands.Restore(_repo.FullPath, pathSpecFile, true).Use(log).ExecAsync();
+                await new Commands.Reset(_repo.FullPath, pathSpecFile).Use(log).ExecAsync();
                 File.Delete(pathSpecFile);
             }
             log.Complete();