Fix reset file commands for deleted files in compare view

When resetting a file to a revision where it is deleted, use 'git rm'
instead of 'git checkout' to properly remove the file from both the
working directory and the index.

- Add new Remove command for git rm operations
- Update ResetToSourceRevisionAsync to handle Added files (don't exist in source)
- Update ResetToTargetRevisionAsync to handle Deleted files (don't exist in target)
- Update multiple file reset methods to separate files into checkout vs remove lists
- Pass Change object instead of just path string to enable state checking
- Use --force and --ignore-unmatch flags for robust file removal

Fixes the "pathspec did not match any file(s) known to git" error when
trying to reset deleted files to the revision where they are deleted.

Author: claude

src/Commands/Remove.cs

@@ -0,0 +1,23 @@
+namespace SourceGit.Commands
+{
+    public class Remove : Command
+    {
+        public Remove(string repo)
+        {
+            WorkingDirectory = repo;
+            Context = repo;
+        }
+
+        public Remove File(string file)
+        {
+            Args = $"rm --force --ignore-unmatch -- {file.Quoted()}";
+            return this;
+        }
+
+        public Remove Files(string pathspecFromFile)
+        {
+            Args = $"rm --force --ignore-unmatch --pathspec-from-file={pathspecFromFile.Quoted()}";
+            return this;
+        }
+    }
+}

src/ViewModels/RevisionCompare.cs

@@ -149,25 +149,45 @@ public async Task SaveChangesAsPatchAsync(List<Models.Change> changes, string sa
                 App.SendNotification(_repo, App.Text("SaveAsPatchSuccess"));
         }
 
-        public async Task ResetToSourceRevisionAsync(string path)
+        public async Task ResetToSourceRevisionAsync(Models.Change change)
         {
             var sourceSHA = GetSHA(_startPoint);
             if (string.IsNullOrEmpty(sourceSHA))
                 return;
 
             var log = _repository?.CreateLog($"Reset File to '{sourceSHA}'");
-            await new Commands.Checkout(_repo).Use(log).FileWithRevisionAsync(path, sourceSHA);
+
+            // If file is Added in diff, it doesn't exist in source - remove it
+            if (change.Index == Models.ChangeState.Added)
+            {
+                await new Commands.Remove(_repo).Use(log).File(change.Path).ExecAsync();
+            }
+            else
+            {
+                await new Commands.Checkout(_repo).Use(log).FileWithRevisionAsync(change.Path, sourceSHA);
+            }
+
             log?.Complete();
         }
 
-        public async Task ResetToTargetRevisionAsync(string path)
+        public async Task ResetToTargetRevisionAsync(Models.Change change)
         {
             var targetSHA = GetSHA(_endPoint);
             if (string.IsNullOrEmpty(targetSHA))
                 return;
 
             var log = _repository?.CreateLog($"Reset File to '{targetSHA}'");
-            await new Commands.Checkout(_repo).Use(log).FileWithRevisionAsync(path, targetSHA);
+
+            // If file is Deleted in diff, it doesn't exist in target - remove it
+            if (change.Index == Models.ChangeState.Deleted)
+            {
+                await new Commands.Remove(_repo).Use(log).File(change.Path).ExecAsync();
+            }
+            else
+            {
+                await new Commands.Checkout(_repo).Use(log).FileWithRevisionAsync(change.Path, targetSHA);
+            }
+
             log?.Complete();
         }
 
@@ -177,12 +197,31 @@ public async Task ResetMultipleToSourceRevisionAsync(List<Models.Change> changes
             if (string.IsNullOrEmpty(sourceSHA))
                 return;
 
-            var files = new List<string>();
+            var filesToCheckout = new List<string>();
+            var filesToRemove = new List<string>();
+
+            // Separate files: Added files don't exist in source, so remove them
             foreach (var c in changes)
-                files.Add(c.Path);
+            {
+                if (c.Index == Models.ChangeState.Added)
+                    filesToRemove.Add(c.Path);
+                else
+                    filesToCheckout.Add(c.Path);
+            }
 
             var log = _repository?.CreateLog($"Reset Files to '{sourceSHA}'");
-            await new Commands.Checkout(_repo).Use(log).MultipleFilesWithRevisionAsync(files, sourceSHA);
+
+            if (filesToCheckout.Count > 0)
+                await new Commands.Checkout(_repo).Use(log).MultipleFilesWithRevisionAsync(filesToCheckout, sourceSHA);
+
+            if (filesToRemove.Count > 0)
+            {
+                var pathSpecFile = System.IO.Path.GetTempFileName();
+                await System.IO.File.WriteAllLinesAsync(pathSpecFile, filesToRemove);
+                await new Commands.Remove(_repo).Use(log).Files(pathSpecFile).ExecAsync();
+                System.IO.File.Delete(pathSpecFile);
+            }
+
             log?.Complete();
         }
 
@@ -192,12 +231,31 @@ public async Task ResetMultipleToTargetRevisionAsync(List<Models.Change> changes
             if (string.IsNullOrEmpty(targetSHA))
                 return;
 
-            var files = new List<string>();
+            var filesToCheckout = new List<string>();
+            var filesToRemove = new List<string>();
+
+            // Separate files: Deleted files don't exist in target, so remove them
             foreach (var c in changes)
-                files.Add(c.Path);
+            {
+                if (c.Index == Models.ChangeState.Deleted)
+                    filesToRemove.Add(c.Path);
+                else
+                    filesToCheckout.Add(c.Path);
+            }
 
             var log = _repository?.CreateLog($"Reset Files to '{targetSHA}'");
-            await new Commands.Checkout(_repo).Use(log).MultipleFilesWithRevisionAsync(files, targetSHA);
+
+            if (filesToCheckout.Count > 0)
+                await new Commands.Checkout(_repo).Use(log).MultipleFilesWithRevisionAsync(filesToCheckout, targetSHA);
+
+            if (filesToRemove.Count > 0)
+            {
+                var pathSpecFile = System.IO.Path.GetTempFileName();
+                await System.IO.File.WriteAllLinesAsync(pathSpecFile, filesToRemove);
+                await new Commands.Remove(_repo).Use(log).Files(pathSpecFile).ExecAsync();
+                System.IO.File.Delete(pathSpecFile);
+            }
+
             log?.Complete();
         }
 

src/Views/RevisionCompare.axaml.cs

@@ -114,7 +114,7 @@ private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e
                         resetToSource.Icon = App.CreateMenuIcon("Icons.File.Checkout");
                         resetToSource.Click += async (_, ev) =>
                         {
-                            await vm.ResetToSourceRevisionAsync(change.Path);
+                            await vm.ResetToSourceRevisionAsync(change);
                             ev.Handled = true;
                         };
 
@@ -123,7 +123,7 @@ private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e
                         resetToTarget.Icon = App.CreateMenuIcon("Icons.File.Checkout");
                         resetToTarget.Click += async (_, ev) =>
                         {
-                            await vm.ResetToTargetRevisionAsync(change.Path);
+                            await vm.ResetToTargetRevisionAsync(change);
                             ev.Handled = true;
                         };