6 files changed, 8 insertions, 38 deletions

diff --git a/src/bin/git_remote_nostr/list.rs b/src/bin/git_remote_nostr/list.rs
index b802a4a..eba573b 100644
--- a/src/bin/git_remote_nostr/list.rs
+++ b/src/bin/git_remote_nostr/list.rs
@@ -33,12 +33,7 @@ pub async fn run_list(
     repo_ref: &RepoRef,
     for_push: bool,
 ) -> Result<HashMap<String, HashMap<String, String>>> {
-    let nostr_state =
-        if let Ok(nostr_state) = get_state_from_cache(Some(git_repo.get_path()?), repo_ref).await {
-            Some(nostr_state)
-        } else {
-            None
-        };
+    let nostr_state = (get_state_from_cache(Some(git_repo.get_path()?), repo_ref).await).ok();
 
     let term = console::Term::stderr();
 
@@ -169,7 +164,7 @@ async fn get_open_and_draft_proposals_state(
                                 .as_str(),
                         );
                     }
-                };
+                }
             }
         }
     }
diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs
index 6113c0a..0cb1107 100644
--- a/src/bin/git_remote_nostr/push.rs
+++ b/src/bin/git_remote_nostr/push.rs
@@ -792,7 +792,7 @@ fn create_rejected_refspecs_and_remotes_refspecs(
                                     ).as_str(),
                                 )?;
                             }
-                        };
+                        }
                     } else {
                         // remote_value oid is not present locally
                         // TODO can we download the remote reference?
diff --git a/src/bin/ngit/sub_commands/export_keys.rs b/src/bin/ngit/sub_commands/export_keys.rs
index 45b1b89..4a32a3a 100644
--- a/src/bin/ngit/sub_commands/export_keys.rs
+++ b/src/bin/ngit/sub_commands/export_keys.rs
@@ -12,12 +12,7 @@ use crate::git::Repo;
 
 pub async fn launch() -> Result<()> {
     let git_repo_result = Repo::discover().context("failed to find a git repository");
-    let git_repo = {
-        match git_repo_result {
-            Ok(git_repo) => Some(git_repo),
-            Err(_) => None,
-        }
-    };
+    let git_repo = { git_repo_result.ok() };
 
     if let Ok((signer_info, source)) = get_signer_info(&git_repo.as_ref(), &None, &None, &None) {
         if let Ok((_, user_ref, source)) = load_existing_login(
diff --git a/src/bin/ngit/sub_commands/init.rs b/src/bin/ngit/sub_commands/init.rs
index 9c544d6..3c58a52 100644
--- a/src/bin/ngit/sub_commands/init.rs
+++ b/src/bin/ngit/sub_commands/init.rs
@@ -70,21 +70,11 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
 
     let mut client = Client::default();
 
-    let repo_coordinate = if let Ok(repo_coordinate) =
-        try_and_get_repo_coordinates_when_remote_unknown(&git_repo).await
-    {
-        Some(repo_coordinate)
-    } else {
-        None
-    };
+    let repo_coordinate = (try_and_get_repo_coordinates_when_remote_unknown(&git_repo).await).ok();
 
     let repo_ref = if let Some(repo_coordinate) = &repo_coordinate {
         fetching_with_report(git_repo_path, &client, repo_coordinate).await?;
-        if let Ok(repo_ref) = get_repo_ref_from_cache(Some(git_repo_path), repo_coordinate).await {
-            Some(repo_ref)
-        } else {
-            None
-        }
+        (get_repo_ref_from_cache(Some(git_repo_path), repo_coordinate).await).ok()
     } else {
         None
     };
diff --git a/src/bin/ngit/sub_commands/login.rs b/src/bin/ngit/sub_commands/login.rs
index 06236ec..e76a089 100644
--- a/src/bin/ngit/sub_commands/login.rs
+++ b/src/bin/ngit/sub_commands/login.rs
@@ -32,12 +32,7 @@ pub async fn launch(args: &Cli, command_args: &SubCommandArgs) -> Result<()> {
     };
 
     let git_repo_result = Repo::discover().context("failed to find a git repository");
-    let git_repo = {
-        match git_repo_result {
-            Ok(git_repo) => Some(git_repo),
-            Err(_) => None,
-        }
-    };
+    let git_repo = { git_repo_result.ok() };
 
     let (logged_out, log_in_locally_only) = logout(git_repo.as_ref(), command_args.local).await?;
     if logged_out || log_in_locally_only {
diff --git a/src/bin/ngit/sub_commands/logout.rs b/src/bin/ngit/sub_commands/logout.rs
index 2df96c8..da445b4 100644
--- a/src/bin/ngit/sub_commands/logout.rs
+++ b/src/bin/ngit/sub_commands/logout.rs
@@ -11,12 +11,7 @@ use crate::{
 
 pub async fn launch() -> Result<()> {
     let git_repo_result = Repo::discover().context("failed to find a git repository");
-    let git_repo = {
-        match git_repo_result {
-            Ok(git_repo) => Some(git_repo),
-            Err(_) => None,
-        }
-    };
+    let git_repo = { git_repo_result.ok() };
     logout(git_repo.as_ref()).await
 }