Amendments to resolve merge conflict and fix clippy errors

Author: alphathekiwi

crates/git_ui/src/git_panel.rs

@@ -4169,7 +4169,6 @@ impl GitPanel {
                 h_flex()
                     .items_center()
                     .flex_1()
-                    // .overflow_hidden()
                     .when_some(old_path.as_ref(), |this, old_path| {
                         let new_display = old_path.display(path_style).to_string();
                         let old_display = entry.repo_path.display(path_style).to_string();
@@ -4178,29 +4177,25 @@ impl GitPanel {
                             .child(self.entry_label(new_display, label_color))
                     })
                     .when(old_path.is_none(), |this| {
-                        this.
-                            .when(git_path_style == GitPathStyle::FileNameFirst, |this| {
-                                name_label(status, label_color, this, format!("{display_name} "))
-                            })
-                        .when_some(
-                            entry.parent_dir(path_style),
-                            |this, parent| {
-                                if !parent.is_empty() {
-                                    this.child(
-                                        self.entry_label(
-                                            format!("{parent}{}", path_style.separator()),
-                                            path_color,
-                                        )
-                                        .when(status.is_deleted(), |this| this.strikethrough()),
+                        this.when(git_path_style == GitPathStyle::FileNameFirst, |this| {
+                            name_label(status, label_color, this, format!("{display_name} "))
+                        })
+                        .when_some(entry.parent_dir(path_style), |this, parent| {
+                            if !parent.is_empty() {
+                                this.child(
+                                    self.entry_label(
+                                        format!("{parent}{}", path_style.separator()),
+                                        path_color,
                                     )
-                                } else {
-                                    this
-                                }
-                            },
-                        )
+                                    .when(status.is_deleted(), |this| this.strikethrough()),
+                                )
+                            } else {
+                                this
+                            }
+                        })
                         .when(git_path_style == GitPathStyle::FilePathFirst, |this| {
                             name_label(status, label_color, this, display_name)
-                        }),
+                        })
                     }),
             )
             .into_any_element()

crates/settings_ui/src/page_data.rs

@@ -5495,13 +5495,13 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
                     files: USER,
                 }),
                 SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show Change Counters",
-                    description: "When to show change counters in the git gutter.",
+                    title: "Path Style",
+                    description: "Should the name or path be displayed first in the git view.",
                     field: Box::new(SettingField {
-                        json_path: Some("git.show_change_counters"),
-                        pick: |settings_content| settings_content.git.as_ref()?.show_change_counters.as_ref(),
+                        json_path: Some("git.path_style"),
+                        pick: |settings_content| settings_content.git.as_ref()?.path_style.as_ref(),
                         write: |settings_content, value| {
-                            settings_content.git.get_or_insert_default().show_change_counters = value;
+                            settings_content.git.get_or_insert_default().path_style = value;
                         },
                     }),
                     metadata: None,

crates/settings_ui/src/settings_ui.rs

@@ -452,7 +452,7 @@ fn init_renderers(cx: &mut App) {
         .add_basic_renderer::<settings::DockPosition>(render_dropdown)
         .add_basic_renderer::<settings::GitGutterSetting>(render_dropdown)
         .add_basic_renderer::<settings::GitHunkStyleSetting>(render_dropdown)
-        .add_basic_renderer::<settings::GitShowChangeCounters>(render_dropdown)
+        .add_basic_renderer::<settings::GitPathStyle>(render_dropdown)
         .add_basic_renderer::<settings::DiagnosticSeverityContent>(render_dropdown)
         .add_basic_renderer::<settings::SeedQuerySetting>(render_dropdown)
         .add_basic_renderer::<settings::DoubleClickInMultibuffer>(render_dropdown)