Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
perf(git): use upstream_single() for single-branch lookups (#2338)
Maximilian Roos19db907ab871
diff --git a/src/commands/worktree/switch.rs b/src/commands/worktree/switch.rsindex f74cb6f22..ecdece318 100644--- a/src/commands/worktree/switch.rs+++ b/src/commands/worktree/switch.rs@@ -833,7 +833,7 @@ pub fn execute_switch(// Report tracking info when the branch was auto-created from a remotelet from_remote = if !create_branch && !local_branch_existed {- branch_handle.upstream()?+ branch_handle.upstream_single()?} else {None};diff --git a/src/git/repository/branch.rs b/src/git/repository/branch.rsindex 273ca67bf..357d7fc28 100644--- a/src/git/repository/branch.rs+++ b/src/git/repository/branch.rs@@ -90,15 +90,17 @@ impl<'a> Branch<'a> {Ok(remotes)}- /// Get the upstream tracking branch for this branch.+ /// Get the upstream tracking branch for this branch. Use this when the+ /// caller (or its caller) will query many branches; use+ /// [`upstream_single`] when exactly one branch is looked up.////// First call in a process triggers `fetch_all_upstreams` — one/// `git for-each-ref` over every local branch, cached for subsequent- /// calls. Amortizes well when callers query many branches- /// (`wt list`, integration target resolution). Prefer- /// [`upstream_single`] on hot paths that look up exactly one branch- /// (e.g. alias/hook template expansion), where the bulk scan becomes- /// O(branches) overhead the single call can't amortize.+ /// calls. That bulk scan amortizes well across the per-worktree tasks+ /// in `wt list`, where every row needs an upstream. On a single-branch+ /// path (alias/hook template expansion, one-shot lookups during+ /// switch/merge) the scan is O(branches) overhead with nothing to+ /// amortize against — reach for [`upstream_single`] instead.////// [`upstream_single`]: Self::upstream_singlepub fn upstream(&self) -> anyhow::Result<Option<String>> {@@ -111,7 +113,9 @@ impl<'a> Branch<'a> {}/// Get this branch's upstream without the bulk scan used by- /// [`upstream`]. Runs one `git for-each-ref` scoped to this branch's+ /// [`upstream`]. Prefer this when exactly one branch is being looked+ /// up; prefer [`upstream`] when the caller (or its caller) will query+ /// many branches. Runs one `git for-each-ref` scoped to this branch's/// ref — O(1) in local branch count.////// Handles the `[gone]` track state the same way as the bulk path:diff --git a/src/git/repository/integration.rs b/src/git/repository/integration.rsindex 5a820a92e..dfd9d5bd0 100644--- a/src/git/repository/integration.rs+++ b/src/git/repository/integration.rs@@ -433,8 +433,10 @@ impl Repository {.effective_integration_targets.entry(local_target.to_string()).or_insert_with(|| {- // Get the upstream ref for the local target (e.g., origin/main for main)- let upstream = match self.branch(local_target).upstream() {+ // Get the upstream ref for the local target (e.g., origin/main for main).+ // Single-branch lookup — cached per-target in `effective_integration_targets`,+ // so the bulk scan `upstream()` would run is pure overhead here.+ let upstream = match self.branch(local_target).upstream_single() {Ok(Some(upstream)) => upstream,_ => return local_target.to_string(),};