fixup! Comment for status update

gitextensions · May 18, 2020 · a8d832f · a8d832f
1 parent 6962fa2
commit a8d832f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/GitCommands/Submodules/SubmoduleStatusProvider.cs b/GitCommands/Submodules/SubmoduleStatusProvider.cs
@@ -86,7 +86,7 @@ public async Task UpdateSubmodulesStructureAsync(string workingDirectory, string
             var currentModule = new GitModule(workingDirectory);
             var result = new SubmoduleInfoResult { Module = currentModule };
 
-            // Add all submodules inside the current repository:
+            // Add all submodules inside the current repository
             GetSuperProjectRepositorySubmodulesStructure(currentModule, result, noBranchText);
             SetOurSubmoduleData(currentModule, result);
 
@@ -100,14 +100,14 @@ public async Task UpdateSubmodulesStructureAsync(string workingDirectory, string
             // Structure is updated
             OnStatusUpdated(result, cancelToken);
 
-            if (updateStatus)
+            if (updateStatus && currentModule.SuperprojectModule != null)
             {
-                // Update status below top module (but not the top module itself), stop at current module (that is handled by git-status)
+                // For the topmodule, use git-status information to update the status
+                // If a submodule is current update for all submodules to give an overview
+                // The structure below the current module could have been updated from git-status but the current module
+                // must be updated from its superproject to set the ahead/behind information (once, as the super project info)
                 // Further git-status updates only the current module and below
-                var info = _submoduleInfos[workingDirectory];
-                _submoduleInfos[workingDirectory] = null;
                 await GetSubmoduleDetailedStatusAsync(currentModule.GetTopModule(), cancelToken);
-                _submoduleInfos[workingDirectory] = info;
             }
 
             _submoduleInfoResult = result;
@@ -331,9 +331,10 @@ private async Task UpdateSubmodulesStatusAsync(GitModule module, [CanBeNull] IRe
                 // (changed commit can be missed, but top module can only be dirty)
                 SetModuleAsDirtyUpwards(module);
             }
-            else
+            else if (_submoduleInfos[module.WorkingDir].Detailed != null && _submoduleInfos[module.WorkingDir].Detailed.Status == SubmoduleStatus.Unknown)
             {
                 // No Git changes for this module, clear status (but unknown for super projects)
+                // To clear ahead/behind requires call from a super project
                 _submoduleInfos[module.WorkingDir].Detailed = null;
             }
 

diff --git a/GitUI/CommandsDialogs/FormBrowse.cs b/GitUI/CommandsDialogs/FormBrowse.cs
@@ -2577,7 +2577,7 @@ Image GetSubmoduleItemImage(DetailedSubmoduleInfo details)
         private void UpdateSubmodulesStructure()
         {
             // Submodule status is updated on git-status updates. To make sure supermodule status is updated, update immediately (once)
-            var updateStatus = AppSettings.ShowSubmoduleStatus && _gitStatusMonitor.Active && (Module.SuperprojectModule != null);
+            var updateStatus = AppSettings.ShowSubmoduleStatus && _gitStatusMonitor.Active;
 
             toolStripButtonLevelUp.ToolTipText = "";