Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Refactor: Simplify target branch determination in merge and push
Maximilian Roos69a7eb3792ba
diff --git a/src/commands/merge.rs b/src/commands/merge.rsindex 25f3bb9a6..84725f36d 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -14,10 +14,7 @@ pub fn handle_merge(target: Option<&str>, squash: bool, keep: bool) -> Result<().ok_or_else(|| GitError::CommandFailed(format_error("Not on a branch (detached HEAD)")))?;// Get target branch (default to default branch if not provided)- let target_branch = match target {- Some(b) => b.to_string(),- None => repo.default_branch()?,- };+ let target_branch = target.map_or_else(|| repo.default_branch(), |b| Ok(b.to_string()))?;// Check if already on target branchif current_branch == target_branch {diff --git a/src/commands/worktree.rs b/src/commands/worktree.rsindex d8f3ac4bc..11e373083 100644--- a/src/commands/worktree.rs+++ b/src/commands/worktree.rs@@ -216,10 +216,7 @@ pub fn handle_push(target: Option<&str>, allow_merge_commits: bool) -> Result<()let repo = Repository::current();// Get target branch (default to default branch if not provided)- let target_branch = match target {- Some(b) => b.to_string(),- None => repo.default_branch()?,- };+ let target_branch = target.map_or_else(|| repo.default_branch(), |b| Ok(b.to_string()))?;// Check if it's a fast-forwardif !repo.is_ancestor(&target_branch, "HEAD")? {