Insert artificial commits if filter without any matches is applied

Handle selection after refresh if artificial commits are removed from the view
gitextensions · Aug 22, 2022 · 25b7a17 · 25b7a17
1 parent 915cb47
commit 25b7a17
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs b/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs
@@ -1258,7 +1258,7 @@ void OnRevisionReadCompleted()
                     {
                         await TaskScheduler.Default;
 
-                        // No revisions at all received
+                        // No revisions at all received without any filter
                         await semaphoreUpdateGrid.WaitAsync(cancellationToken);
 
                         bool showArtificial = AddArtificialRevisions();
@@ -1291,7 +1291,7 @@ void OnRevisionReadCompleted()
 
                     IEnumerable<ObjectId> headParents = null;
                     bool refresh = false;
-                    if (firstRevisionReceived && !headIsHandled && ShowArtificialRevisions())
+                    if (!headIsHandled && ShowArtificialRevisions())
                     {
                         if (CurrentCheckout is not null)
                         {
@@ -1324,7 +1324,17 @@ void OnRevisionReadCompleted()
                         }
                         else
                         {
-                            parents = TryGetParents(Module, _filterInfo, notSelectedId);
+                            if (notSelectedId.IsArtificial)
+                            {
+                                notSelectedId = CurrentCheckout is not null
+                                    ? CurrentCheckout
+                                    : _gridView.ToBeSelectedObjectIds.Where(id => !id.IsArtificial).FirstOrDefault();
+                            }
+
+                            if (notSelectedId is not null)
+                            {
+                                parents = TryGetParents(Module, _filterInfo, notSelectedId);
+                            }
                         }
 
                         // Try to select the first of the parents