fix(devctl): skip git pull without upstream + separate bump from tag#11
Merged
fix(devctl): skip git pull without upstream + separate bump from tag#11
Conversation
`tb-devctl start --local --dir` failed when the branch had no upstream because `git pull` exits non-zero. Now checks for upstream before pulling, matching the existing dirty-tree guard pattern. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
bump.sh no longer creates tags — it only updates the version and commits. Tags are now created during the publish workflow on main, preventing premature tag pushes from feature branches that trigger CI builds. Updated CLAUDE.md and publish skill to document the two-step flow. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
trogulja
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
tb-devctl start --local --dirfailed when the branch had no upstream tracking becausegit pullexits non-zero. Added an upstream check alongside the existing dirty-tree guard — skips pull with a warning instead of aborting.bump.shno longer creates tags. Tags are created during the publish workflow onmain, preventing premature CI builds from feature branches.Test plan
cargo build -p tb-devctlpassescargo test -p tb-devctlpassestb-devctl start <service> --local --dir <worktree-with-no-upstream>— should print warning and continuescripts/bump.sh tb-devctl 0.1.1— should commit without creating a tag🤖 Generated with Claude Code