Repository navigation
Show a usable push command when the Base branch is missing on origin - #752
Merged
Merged
Conversation
Merged
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
The push command uses explicit source and destination branch refs, so a named Base branch works from another checkout even with a same-named tag. Updates the README's quoted guidance.
Closes #295
Evidence
cargo test --bin thirdshift launch::tests::a_local_base_branch_missing_on_origin_gets_a_working_push_command -- --exactfailed: the error only saidpush it first.After: passes; the test executes the suggested command against a temporary origin and verifies the branch and upstream.
cargo test --bin thirdshift launch::tests::a_base_branch_absent_locally_and_on_origin_gets_no_push_command -- --exactfailed while developing the local-present slice: it suggested pushing a nonexistent branch.After: passes, including a same-named local tag and unchanged local/remote refs.
HEAD, a shadowing tag, and a different checked-out commit. CLI coverage verifies Run, Architect run and Pickup run preflight.cargo check --all-targets,cargo fmt --check,cargo clippy --all-targets -- -D warnings; fullcargo testpassed (1809 passed, 0 failed, 2 ignored).Seams under test
LaunchDirectory::prepare_base_branch: recovery guidance and the suggested command's real Git effects against a temporary origin.Unaddressed findings
Both independent reviewers read every changed file:
README.md,src/launch.rs,src/run.rs,tests/architect_run.rs,tests/pickup_run.rs, andtests/preflight.rs. Changed files left unread: none.Security review outcome
No unaddressed introduced findings.
Merge Danger
Door: two-way
Revert restores the previous diagnostic. No state migration or automatic branch repair.
Blast Radius: preflight
Only missing-origin Base branch recovery guidance changes; existing local-ahead behavior stays covered.
Built with codex · gpt-6.1-sol · high