refactor: diff for staged file with --amend enabled (#1231)

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

Author: love-linger

src/Commands/QueryStagedChangesWithAmend.cs

@@ -16,6 +16,7 @@ public QueryStagedChangesWithAmend(string repo, string parent)
             WorkingDirectory = repo;
             Context = repo;
             Args = $"diff-index --cached -M {parent}";
+            _parent = parent;
         }
 
         public List<Models.Change> Result()
@@ -37,6 +38,7 @@ public QueryStagedChangesWithAmend(string repo, string parent)
                             {
                                 FileMode = match.Groups[1].Value,
                                 ObjectHash = match.Groups[2].Value,
+                                ParentSHA = _parent,
                             },
                         };
                         change.Set(Models.ChangeState.Renamed);
@@ -54,6 +56,7 @@ public QueryStagedChangesWithAmend(string repo, string parent)
                             {
                                 FileMode = match.Groups[1].Value,
                                 ObjectHash = match.Groups[2].Value,
+                                ParentSHA = _parent,
                             },
                         };
 
@@ -88,5 +91,7 @@ public QueryStagedChangesWithAmend(string repo, string parent)
 
             return [];
         }
+
+        private string _parent = string.Empty;
     }
 }

src/Models/Change.cs

@@ -26,6 +26,7 @@ public class ChangeDataForAmend
     {
         public string FileMode { get; set; } = "";
         public string ObjectHash { get; set; } = "";
+        public string ParentSHA { get; set; } = "";
     }
 
     public class Change

src/Models/DiffOption.cs

@@ -40,7 +40,7 @@ public DiffOption(Change change, bool isUnstaged)
             else
             {
                 if (change.DataForAmend != null)
-                    _extra = "--cached HEAD^";
+                    _extra = $"--cached {change.DataForAmend.ParentSHA}";
                 else
                     _extra = "--cached";
 

src/ViewModels/WorkingCopy.cs

@@ -1526,8 +1526,8 @@ public ContextMenu CreateContextForOpenAI()
             if (_useAmend)
             {
                 var head = new Commands.QuerySingleCommit(_repo.FullPath, "HEAD").Result();
-                return new Commands.QueryStagedChangesWithAmend(_repo.FullPath, head.Parents.Count == 0 ? "4b825dc642cb6eb9a060e54bf8d69288fbee4904" : "HEAD^").Result();
-            }                
+                return new Commands.QueryStagedChangesWithAmend(_repo.FullPath, head.Parents.Count == 0 ? "4b825dc642cb6eb9a060e54bf8d69288fbee4904" : $"{head.SHA}^").Result();
+            }
 
             var rs = new List<Models.Change>();
             foreach (var c in _cached)