Fix null variable

files-community · May 11, 2023 · 7d0db5b · 7d0db5b
1 parent 39f0dfc
commit 7d0db5b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/Files.App/Helpers/GitHelpers.cs b/src/Files.App/Helpers/GitHelpers.cs
@@ -43,6 +43,7 @@ public static string[] GetLocalBranchesNames(string? path)
 			return repository.Branches
 				.Where(b => !b.IsRemote)
 				.OrderByDescending(b => b.IsCurrentRepositoryHead)
+				.ThenByDescending(b => b.Tip.Committer.When)
 				.Select(b => b.FriendlyName)
 				.ToArray();
 		}

diff --git a/src/Files.App/ViewModels/DirectoryPropertiesViewModel.cs b/src/Files.App/ViewModels/DirectoryPropertiesViewModel.cs
@@ -42,12 +42,15 @@ public void UpdateGitInfo(bool isGitRepository, string activeBranch, string[] br
 				? string.Format("Branch".GetLocalizedResource(), activeBranch)
 				: null;
 
-			BranchesNames.Clear();
-			foreach (var name in branches)
-				BranchesNames.Add(name);
+			if (isGitRepository)
+			{
+				BranchesNames.Clear();
+				foreach (var name in branches)
+					BranchesNames.Add(name);
 
-			ActiveBranchIndex = BranchesNames.IndexOf(activeBranch);
-			SelectedBranchIndex = ActiveBranchIndex;
+				ActiveBranchIndex = BranchesNames.IndexOf(activeBranch);
+				SelectedBranchIndex = ActiveBranchIndex;
+			}
 		}
 	}
 }