Merge branch 'fixes/changes-view-optimization' into features/lock-files-view

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs

@@ -259,19 +259,26 @@ private void MaybeUpdateData()
                 currentBranch = string.Format("[{0}]", Repository.CurrentBranchName);
             }
 
-            if (currentStatusEntriesHasUpdate || currentLocksHasUpdate)
+            if (currentLocksHasUpdate)
             {
-                currentStatusEntriesHasUpdate = false;
-                currentLocksHasUpdate = false;
-
                 gitLocks = new HashSet<NPath>(Repository.CurrentLocks.Select(gitLock => gitLock.Path));
+            }
+
+            if (currentStatusEntriesHasUpdate)
+            {
                 gitStatusEntries = Repository.CurrentChanges.Where(x => x.Status != GitFileStatus.Ignored).ToList();
 
                 changedFilesText = gitStatusEntries.Count == 0
                     ? NoChangedFilesLabel
                     : gitStatusEntries.Count == 1
                         ? OneChangedFileLabel
                         : String.Format(ChangedFilesLabel, gitStatusEntries.Count);
+            }
+
+            if (currentStatusEntriesHasUpdate || currentLocksHasUpdate)
+            {
+                currentStatusEntriesHasUpdate = false;
+                currentLocksHasUpdate = false;
 
                 BuildTree();
             }