From 2867ec4bc25e2478eba61999ff331af3b54d78d5 Mon Sep 17 00:00:00 2001
From: prayansh_chhablani <135210710+prayanshchh@users.noreply.github.com>
Date: Sun, 1 Feb 2026 00:37:29 +0530
Subject: [PATCH] git: Fix force-added files always showing as ignored (#47057)

Closes #15231
changes the priority in the way files are color-labelled..making sure
forcely added files are highlighted appropriately.
Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 crates/editor/src/items.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index 3ff4d7da4eb654cfe48a223afe2906294fd77c31..df5e43fc8c10856d803316b067e9347a75bfbf35 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -1917,14 +1917,14 @@ pub fn entry_diagnostic_aware_icon_decoration_and_color(
 
 pub fn entry_git_aware_label_color(git_status: GitSummary, ignored: bool, selected: bool) -> Color {
     let tracked = git_status.index + git_status.worktree;
-    if ignored {
-        Color::Ignored
-    } else if git_status.conflict > 0 {
+    if git_status.conflict > 0 {
         Color::Conflict
     } else if tracked.modified > 0 {
         Color::Modified
     } else if tracked.added > 0 || git_status.untracked > 0 {
         Color::Created
+    } else if ignored {
+        Color::Ignored
     } else {
         entry_label_color(selected)
     }