unkin/agent-tools
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

agentws: check out --branch from origin when it exists #17

Merged
benvin merged 2 commits from benvin/agentws-branch-checkout into main 2026-09-19 16:36:46 +10:00
Conversation 0 Commits 2 Files Changed 5
+319 -13
unkin-agent commented 2026-09-19 16:12:10 +10:00
Member
Copy Link
Copy Source

agentws new --branch always forked from the base branch, so a worktree for a branch that already existed on origin started at the base's HEAD with none of the branch's commits, and callers had to reset --hard afterwards to recover.

  • Check out an existing origin/ and set the branch to track it
  • Fast-forward a stale local branch onto origin, keeping unpushed commits
  • Fork from --from or the remote default only when origin lacks the branch
  • Name which of the two paths was taken in the command's output
  • Ignore --from, with a note, when the branch is already on origin
`agentws new --branch` always forked from the base branch, so a worktree for a branch that already existed on origin started at the base's HEAD with none of the branch's commits, and callers had to reset --hard afterwards to recover. - Check out an existing origin/<branch> and set the branch to track it - Fast-forward a stale local branch onto origin, keeping unpushed commits - Fork from --from or the remote default only when origin lacks the branch - Name which of the two paths was taken in the command's output - Ignore --from, with a note, when the branch is already on origin
unkin-agent added 1 commit 2026-09-19 16:12:10 +10:00
agentws: check out --branch from origin when it exists
ci/woodpecker/pr/build Pipeline was successful
Details
ci/woodpecker/pr/test Pipeline was successful
Details
ci/woodpecker/pr/pre-commit Pipeline failed
Details
7510187243 
`agentws new --branch` always forked from the base branch, so a worktree for a
branch that already existed on origin started at the base's HEAD with none of
the branch's commits, and callers had to reset --hard afterwards to recover.

- Check out an existing origin/<branch> and set the branch to track it
- Fast-forward a stale local branch onto origin, keeping unpushed commits
- Fork from --from or the remote default only when origin lacks the branch
- Name which of the two paths was taken in the command's output
- Ignore --from, with a note, when the branch is already on origin
unkin-agent added 1 commit 2026-09-19 16:20:39 +10:00
Run go test once per module in pre-commit
ci/woodpecker/pr/build Pipeline was successful
Details
ci/woodpecker/pr/pre-commit Pipeline was successful
Details
ci/woodpecker/pr/test Pipeline was successful
Details
1b90e60aeb 
The go-unit-tests hook caps every package at 30s and re-runs the whole module
once per file batch, so the git-fixture tests in cmd/agentws timed out as soon
as they grew.

- Replace go-unit-tests with a module-level `go test ./...` local hook
benvin merged commit 81ae4041cd into main 2026-09-19 16:36:46 +10:00
benvin deleted branch benvin/agentws-branch-checkout 2026-09-19 16:36:46 +10:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
bug
Something is not working
 duplicate
This issue or pull request already exists
 enhancement
New feature
 help wanted
Need some help
 invalid
Something is wrong
 question
More information is needed
 wontfix
This won't be fixed
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
benvin (BenVincent) unkin-agent (Unkin Agent) unkinben (Ben Vincent)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: unkin/agent-tools#17
Delete Branch "benvin/agentws-branch-checkout"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?