fix: Simplify return types from Result<Option<String>> to Result<String>

The git_repo_base_ref and find_merge_base_ref functions never return Ok(None),
so simplified return types and removed unreachable code paths.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: runningcode

src/commands/build/upload.rs

@@ -177,14 +177,10 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
                 // This attempts to find the merge-base with the remote tracking branch
                 repo_ref
                     .and_then(|r| match git_repo_base_ref(r, &cached_remote) {
-                        Ok(Some(base_ref_name)) => {
+                        Ok(base_ref_name) => {
                             debug!("Found base reference: {}", base_ref_name);
                             Some(base_ref_name)
                         }
-                        Ok(None) => {
-                            warn!("No base reference found (could not determine merge-base)");
-                            None
-                        }
                         Err(e) => {
                             warn!("Could not detect base branch reference: {}", e);
                             None

src/utils/vcs.rs

@@ -249,7 +249,7 @@ pub fn git_repo_head_ref(repo: &git2::Repository) -> Result<String> {
     }
 }
 
-pub fn git_repo_base_ref(repo: &git2::Repository, remote_name: &str) -> Result<Option<String>> {
+pub fn git_repo_base_ref(repo: &git2::Repository, remote_name: &str) -> Result<String> {
     // Get the current HEAD commit
     let head_commit = repo.head()?.peel_to_commit()?;
 
@@ -270,7 +270,7 @@ fn find_merge_base_ref(
     repo: &git2::Repository,
     head_commit: &git2::Commit,
     remote_ref: &git2::Reference,
-) -> Result<Option<String>> {
+) -> Result<String> {
     let remote_commit = remote_ref.peel_to_commit()?;
     let merge_base_oid = repo.merge_base(head_commit.id(), remote_commit.id())?;
 
@@ -280,7 +280,7 @@ fn find_merge_base_ref(
         "Found merge-base commit as base reference: {}",
         merge_base_sha
     );
-    Ok(Some(merge_base_sha))
+    Ok(merge_base_sha)
 }
 
 fn find_reference_url(repo: &str, repos: &[Repo]) -> Result<Option<String>> {