From da5fcf93d5597ca4db81bd5a1acd37d1cb990cba Mon Sep 17 00:00:00 2001 From: "gcp-cherry-pick-bot[bot]" <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Tue, 18 Mar 2025 08:30:16 -0400 Subject: [PATCH] git: Always zero panel's entry counts when clearing entries (cherry-pick #26924) (#26965) Cherry-picked git: Always zero panel's entry counts when clearing entries (#26924) Keep the panel's state consistent even when we transition to having no active repository. Release Notes: - N/A Co-authored-by: Cole Miller --- crates/git_ui/src/git_panel.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs index 6a72409f12ea881bab48aef5bb78bac8d76a7355..07c1fc23c8a2a9f32abac5d39cb85fda79327035 100644 --- a/crates/git_ui/src/git_panel.rs +++ b/crates/git_ui/src/git_panel.rs @@ -2243,7 +2243,14 @@ impl GitPanel { fn update_visible_entries(&mut self, cx: &mut Context) { self.entries.clear(); self.single_staged_entry.take(); - self.single_staged_entry.take(); + self.conflicted_count = 0; + self.conflicted_staged_count = 0; + self.new_count = 0; + self.tracked_count = 0; + self.new_staged_count = 0; + self.tracked_staged_count = 0; + self.entry_count = 0; + let mut changed_entries = Vec::new(); let mut new_entries = Vec::new(); let mut conflict_entries = Vec::new();