Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Improve `primary_remote` to use configured remotes
Maximilian Roos24e46665bab1
diff --git a/src/git/repository/mod.rs b/src/git/repository/mod.rsindex 5712679f2..e4b9f7c5d 100644--- a/src/git/repository/mod.rs+++ b/src/git/repository/mod.rs@@ -130,8 +130,9 @@ impl Repository {/// Uses the following strategy:/// 1. If the current branch has an upstream, use its remote/// (Note: Detached HEAD falls through to step 2)- /// 2. Otherwise, get the first remote with a configured URL- /// 3. Fall back to "origin" if no remotes exist+ /// 2. Use git's `checkout.defaultRemote` config if set and has a URL+ /// 3. Otherwise, get the first remote with a configured URL+ /// 4. Fall back to "origin" if no remotes existpub fn primary_remote(&self) -> anyhow::Result<String> {// Try to get the remote from the current branch's upstreamif let Ok(Some(branch)) = self.current_branch()@@ -141,6 +142,14 @@ impl Repository {return Ok(remote.to_string());}+ // Check git's checkout.defaultRemote config+ if let Ok(default_remote) = self.run_command(&["config", "checkout.defaultRemote"]) {+ let default_remote = default_remote.trim();+ if !default_remote.is_empty() && self.remote_has_url(default_remote) {+ return Ok(default_remote.to_string());+ }+ }+// Fall back to first remote with a configured URL// Use git config to find remotes with URLs, filtering out phantom remotes// from global config (e.g., `remote.origin.prunetags=true` without a URL)@@ -158,6 +167,13 @@ impl Repository {Ok(first_remote.unwrap_or("origin").to_string())}+ /// Check if a remote has a URL configured.+ fn remote_has_url(&self, remote: &str) -> bool {+ self.run_command(&["config", &format!("remote.{}.url", remote)])+ .map(|url| !url.trim().is_empty())+ .unwrap_or(false)+ }+/// Check if a local git branch exists.pub fn local_branch_exists(&self, branch: &str) -> anyhow::Result<bool> {Ok(self