Skip to content

fix: resolve_target fallback via git worktree list for external worktrees #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
helizaga merged 1 commit into from
Feb 17, 2026
Merged

fix: resolve_target fallback via git worktree list for external worktrees #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions lib/core.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,24 @@ resolve_target() {
done
fi

# Last resort: ask git for all worktrees (catches non-gtr-managed worktrees)
local wt_path wt_branch
while IFS= read -r line; do
case "$line" in
"worktree "*) wt_path="${line#worktree }" ;;
"branch "*)
wt_branch="${line#branch refs/heads/}"
if [ "$wt_branch" = "$identifier" ]; then
local is_main=0
[ "$wt_path" = "$repo_root" ] && is_main=1
printf "%s\t%s\t%s\n" "$is_main" "$wt_path" "$wt_branch"
return 0
fi
;;
"") wt_path="" ; wt_branch="" ;;
esac
done < <(git -C "$repo_root" worktree list --porcelain 2>/dev/null)

log_error "Worktree not found for branch: $identifier"
return 1
}
Expand Down
12 changes: 12 additions & 0 deletions tests/core_resolve_target.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,18 @@ teardown() {
[ "$status" -eq 1 ]
}

# ── porcelain fallback ─────────────────────────────────────────────────────────

@test "resolve_target finds externally-created worktree via porcelain fallback" {
# Create a worktree with raw git (outside gtr-managed directory)
local ext_dir="${TEST_REPO}-external"
git -C "$TEST_REPO" worktree add "$ext_dir" -b external-branch --quiet
local result
result=$(resolve_target "external-branch" "$TEST_REPO" "$TEST_WORKTREES_DIR" "")
# Assert: found with is_main=0, correct branch, path ends with expected suffix
[[ "$result" == "0"$'\t'*"-external"$'\t'"external-branch" ]]
}

# ── discover_repo_root from worktree ──────────────────────────────────────────

@test "discover_repo_root returns main repo root when called from a worktree" {
Expand Down