fix: new added file in stash changes may not come from untracked file but from staged files (#1358)

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

Author: love-linger

src/Commands/QueryStashChanges.cs

@@ -21,10 +21,5 @@ public static class GitVersions
         ///     The minimal version of Git that supports the `stash push` command with the `--staged` option.
         /// </summary>
         public static readonly System.Version STASH_PUSH_ONLY_STAGED = new System.Version(2, 35, 0);
-
-        /// <summary>
-        ///     The minimal version of Git that supports the `stash show` command with the `-u` option.
-        /// </summary>
-        public static readonly System.Version STASH_SHOW_WITH_UNTRACKED = new System.Version(2, 32, 0);
     }
 }

src/Models/GitVersions.cs

@@ -53,34 +53,32 @@ public Models.Stash SelectedStash
                     if (value == null)
                     {
                         Changes = null;
+                        _untracked.Clear();
                     }
                     else
                     {
                         Task.Run(() =>
                         {
-                            var changes = null as List<Models.Change>;
-
-                            if (Native.OS.GitVersion >= Models.GitVersions.STASH_SHOW_WITH_UNTRACKED)
-                            {
-                                changes = new Commands.QueryStashChanges(_repo.FullPath, value.Name).Result();
-                            }
-                            else
+                            var changes = new Commands.CompareRevisions(_repo.FullPath, $"{value.SHA}^", value.SHA).Result();
+                            var untracked = new List<Models.Change>();
+                            
+                            if (value.Parents.Count == 3)
                             {
-                                changes = new Commands.CompareRevisions(_repo.FullPath, $"{value.SHA}^", value.SHA).Result();
-                                if (value.Parents.Count == 3)
-                                {
-                                    var untracked = new Commands.CompareRevisions(_repo.FullPath, Models.Commit.EmptyTreeSHA1, value.Parents[2]).Result();
-                                    var needSort = changes.Count > 0;
-
-                                    foreach (var c in untracked)
-                                        changes.Add(c);
-
-                                    if (needSort)
-                                        changes.Sort((l, r) => string.Compare(l.Path, r.Path, StringComparison.Ordinal));
-                                }
+                                untracked = new Commands.CompareRevisions(_repo.FullPath, Models.Commit.EmptyTreeSHA1, value.Parents[2]).Result();
+                                var needSort = changes.Count > 0 && untracked.Count > 0;
+
+                                foreach (var c in untracked)
+                                    changes.Add(c);
+
+                                if (needSort)
+                                    changes.Sort((l, r) => string.Compare(l.Path, r.Path, StringComparison.Ordinal));
                             }
 
-                            Dispatcher.UIThread.Invoke(() => Changes = changes);
+                            Dispatcher.UIThread.Invoke(() =>
+                            {
+                                _untracked = untracked;
+                                Changes = changes;
+                            });
                         });
                     }
                 }
@@ -106,7 +104,7 @@ public Models.Change SelectedChange
                 {
                     if (value == null)
                         DiffContext = null;
-                    else if (value.Index == Models.ChangeState.Added && _selectedStash.Parents.Count == 3)
+                    else if (_untracked.Contains(value))
                         DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption(Models.Commit.EmptyTreeSHA1, _selectedStash.Parents[2], value), _diffContext);
                     else
                         DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption(_selectedStash.Parents[0], _selectedStash.SHA, value), _diffContext);
@@ -129,6 +127,7 @@ public void Dispose()
         {
             _stashes?.Clear();
             _changes?.Clear();
+            _untracked.Clear();
 
             _repo = null;
             _selectedStash = null;
@@ -309,6 +308,7 @@ private void RefreshVisible()
         private string _searchFilter = string.Empty;
         private Models.Stash _selectedStash = null;
         private List<Models.Change> _changes = null;
+        private List<Models.Change> _untracked = [];
         private Models.Change _selectedChange = null;
         private DiffContext _diffContext = null;
     }