refactor: factor out base fallback

Author: ErichDonGubler

src/main.rs

@@ -150,35 +150,40 @@ fn main() {
 
             Ok(branches)
         };
+
+        let fallback_base = || -> git_glimpse::Result<_> {
+            let base = git_config("glimpse.base")?;
+            let base = base.unwrap_or_else(|| {
+                let default = "main";
+                log::debug!(
+                    "no base branch specified in command line or configuration, falling back to \
+                    {default:?}"
+                );
+                default.to_owned()
+            });
+            Ok(base)
+        };
+
         let (branches, files) = match subcommand {
             Subcommand::Stack {
                 base,
                 config,
                 files: FileSelection { files },
             } => {
-                let specified_base = base
-                    .map(Ok)
-                    .or_else(|| git_config("glimpse.base").transpose())
-                    .transpose()?;
-                let base = specified_base.as_deref().unwrap_or_else(|| {
-                    let default = "main";
-                    log::debug!("no base branch specified in command line or configuration, falling back to {default:?}");
-                    default
-                });
-
+                let base = base.map(Ok).unwrap_or_else(fallback_base)?;
                 let branches = if let Some(current_branch) = current_branch()? {
                     let mut config = config;
                     if current_branch == base {
                         config.select_upstreams = true;
                     }
                     branches(&config, &|cmd| {
                         if base != current_branch {
-                            cmd.arg(base);
+                            cmd.arg(&base);
                         }
                         cmd.arg(&current_branch).arg("--all")
                     })?
                 } else {
-                    let mut branches = branches(&config, &|cmd| cmd.arg(base).arg("--all"))?;
+                    let mut branches = branches(&config, &|cmd| cmd.arg(&base).arg("--all"))?;
                     branches.push("HEAD".to_owned());
                     branches
                 };