fix(operating-modes): address review feedback

Author: krlvi

crates/gitbutler-operating-modes/src/lib.rs

@@ -79,14 +79,18 @@ pub enum OperatingMode {
 }
 
 pub fn operating_mode(ctx: &Context) -> OperatingMode {
+    let outside = || OperatingMode::OutsideWorkspace(outside_workspace_metadata(ctx).unwrap_or_default());
+
     let Ok(repo) = ctx.repo.get() else {
-        return OperatingMode::OutsideWorkspace(outside_workspace_metadata(ctx).unwrap_or_default());
+        // If we can't even open/borrow the repo handle, attempting to compute metadata would just
+        // try (and fail) to open it again.
+        return OperatingMode::OutsideWorkspace(OutsideWorkspaceMetadata::default());
     };
     let Ok(head_ref) = repo.head() else {
-        return OperatingMode::OutsideWorkspace(outside_workspace_metadata(ctx).unwrap_or_default());
+        return outside();
     };
     let Some(head_ref_name) = head_ref.referent_name().map(|name| name.as_bstr()) else {
-        return OperatingMode::OutsideWorkspace(outside_workspace_metadata(ctx).unwrap_or_default());
+        return outside();
     };
 
     if OPEN_WORKSPACE_REFS
@@ -104,11 +108,11 @@ pub fn operating_mode(ctx: &Context) -> OperatingMode {
                     "Failed to open in edit mode, falling back to outside workspace {}",
                     error
                 );
-                OperatingMode::OutsideWorkspace(outside_workspace_metadata(ctx).unwrap_or_default())
+                outside()
             }
         }
     } else {
-        OperatingMode::OutsideWorkspace(outside_workspace_metadata(ctx).unwrap_or_default())
+        outside()
     }
 }
 

crates/gitbutler-operating-modes/tests/operating_modes.rs

@@ -22,6 +22,26 @@ fn create_edit_mode_metadata(ctx: &Context) {
 }
 
 mod operating_modes {
+    mod invalid_repo_fallback {
+        use gitbutler_testsupport::{Case, Suite};
+
+        #[test]
+        fn operating_mode_falls_back_to_outside_workspace_when_repo_cannot_be_opened() {
+            let suite = Suite::default();
+            let Case { ctx, .. } = &suite.new_case();
+
+            // Make opening the repo fail by removing the `.git` directory.
+            std::fs::remove_dir_all(&ctx.gitdir).unwrap();
+
+            assert_eq!(
+                gitbutler_operating_modes::operating_mode(&ctx),
+                gitbutler_operating_modes::OperatingMode::OutsideWorkspace(
+                    gitbutler_operating_modes::OutsideWorkspaceMetadata::default()
+                )
+            );
+        }
+    }
+
     mod open_workspace_mode {
         use gitbutler_operating_modes::{ensure_open_workspace_mode, in_open_workspace_mode};
         use gitbutler_testsupport::{Case, Suite};