Repository navigation
feat(push): RILL_PUSH_BRANCH target and rill.writer config - #102
Merged
Merged
Conversation
Cloud sessions check out a per-session claude/ branch, so a plain push lands there instead of on the branch every other writer shares. With RILL_PUSH_BRANCH set (e.g. main in the cloud environment), rill push rebases onto that branch of the push remote and pushes HEAD to it. The Rill-Writer fallback now reads git config rill.writer before the host name, so a machine whose host name carries a personal name can set a neutral one once. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…ack test Address Codex review (P2 only): a single-branch clone would not update the target's tracking ref, so the rebase was skipped. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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
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
RILL_PUSH_BRANCH=<branch>makesrill pushfetch that branch of the push remote by name, rebase onto it, and pushHEADto it. Cloud sessions check out a per-sessionclaude/...branch; settingRILL_PUSH_BRANCH=mainin the cloud environment lets them sharemainwith every other writer. An invalid name is refused.Rill-Writerfallback readsgit config rill.writerbefore the host name.Why
A first cloud-session test ran
rill pushonclaude/<session>; it failed with "no upstream branch" and the work never reachedmain.Review
codex review: two P2 (explicit fetch for single-branch clones; test env isolation), both fixed. No P1.Test plan
bash test/cli/test-push-rebase.sh(51/51, also withRILL_WRITERset in the caller's env)bash test/cli/test-cli-smoke.sh(50/50)🤖 Generated with Claude Code