Fix: Fixed an issue where Git columns were incorrectly shown in search results (#13111)

Author: QuaintMako

src/Files.App/Data/Models/ColumnsViewModel.cs

@@ -12,6 +12,7 @@ public class ColumnsViewModel : ObservableObject
 			UserLength = new GridLength(24, GridUnitType.Pixel),
 			IsResizeable = false,
 		};
+
 		[LiteDB.BsonIgnore]
 		public ColumnViewModel IconColumn
 		{

src/Files.App/Data/Models/CurrentInstanceViewModel.cs

@@ -1,8 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using LibGit2Sharp;
-
 namespace Files.App.Data.Models
 {
 	public class CurrentInstanceViewModel : ObservableObject

src/Files.App/Data/Models/DirectoryPropertiesViewModel.cs

@@ -7,6 +7,8 @@ namespace Files.App.Data.Models
 {
 	public class DirectoryPropertiesViewModel : ObservableObject
 	{
+		private IContentPageContext ContentPageContext { get; } = Ioc.Default.GetRequiredService<IContentPageContext>();
+
 		// The first branch will always be the active one.
 		public const int ACTIVE_BRANCH_INDEX = 0;
 
@@ -86,13 +88,15 @@ public string ExtendedStatusInfo
 
 		public DirectoryPropertiesViewModel()
 		{
-			NewBranchCommand = new AsyncRelayCommand(() 
+			NewBranchCommand = new AsyncRelayCommand(()
 				=> GitHelpers.CreateNewBranch(_gitRepositoryPath!, _localBranches[ACTIVE_BRANCH_INDEX]));
 		}
 
 		public void UpdateGitInfo(bool isGitRepository, string? repositoryPath, BranchItem[] branches)
 		{
-			GitBranchDisplayName = isGitRepository && branches.Any()
+			GitBranchDisplayName = isGitRepository &&
+								branches.Any() &&
+								!(ContentPageContext.ShellPage!.InstanceViewModel.IsPageTypeSearchResults)
 				? branches[ACTIVE_BRANCH_INDEX].Name
 				: null;
 

src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs

@@ -205,7 +205,6 @@ private void UpdateSortIndicator()
 
 		private void FilesystemViewModel_PageTypeUpdated(object? sender, PageTypeUpdatedEventArgs e)
 		{
-			// Show original path and date deleted columns in Recycle Bin
 			if (e.IsTypeRecycleBin)
 			{
 				ColumnsViewModel.OriginalPathColumn.Show();
@@ -217,14 +216,12 @@ private void FilesystemViewModel_PageTypeUpdated(object? sender, PageTypeUpdated
 				ColumnsViewModel.DateDeletedColumn.Hide();
 			}
 
-			// Show cloud drive item status column
 			if (e.IsTypeCloudDrive)
 				ColumnsViewModel.StatusColumn.Show();
 			else
 				ColumnsViewModel.StatusColumn.Hide();
 
-			// Show git columns in git repository
-			if (e.IsTypeGitRepository)
+			if (e.IsTypeGitRepository && !e.IsTypeSearchResults)
 			{
 				ColumnsViewModel.GitCommitAuthorColumn.Show();
 				ColumnsViewModel.GitLastCommitDateColumn.Show();
@@ -241,7 +238,6 @@ private void FilesystemViewModel_PageTypeUpdated(object? sender, PageTypeUpdated
 				ColumnsViewModel.GitStatusColumn.Hide();
 			}
 
-			// Show path columns in git repository
 			if (e.IsTypeSearchResults)
 				ColumnsViewModel.PathColumn.Show();
 			else