tooling: land.sh refuses to land the worktree session's own branch
Nobody has claimed this yet.
Assessment
- Difficulty
- 2/5
- Estimated time
- 1-3 hours
- Newbie friendliness
- 74/100
Research direction
Start with land.sh and reproduce the failure from a worktree session whose own branch contains commits beyond origin/main. Trace the reset refusal and the branch-landing path, then verify that a sole HEAD branch can be landed when origin/main is its ancestor without requiring a manual push; confirm the existing refusal still applies to unrelated histories.
Written by the indexing model from the issue text.
Description
From a worktree session (e.g. bridge-cse_*), land.sh <own-branch> exits 2: 'refusing to reset : HEAD has N commit(s) not on origin/main'. The worker committed on the session's branch, so the only route was a manual fast-forward git push origin HEAD:main. Fix: when the sole branch being landed is HEAD and origin/main is its ancestor, skip the reset and verify/push in place (or have land.sh create a temp landing worktree).
- Dominant language
- Kotlin
- Stars
- 229
- Forks
- 28
- PR merge metrics
- No merged PRs in 30d
Getting set up
- No Dockerfile or Docker Compose file
- No pull request template
- Read the contributing guide
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
More from timusus/Shuttle2
-
enhancement impact:U1 later P3 reach:R2 size:S
Difficulty 2/5 1-3 hours Newbie friendliness 68/100
-
impact:U1 owner reach:R1 size:S
Difficulty 2/5 1-3 hours Newbie friendliness 72/100
-
enhancement impact:U1 later P3 reach:R2 size:S
Difficulty 3/5 1-2 days Newbie friendliness 58/100
-
enhancement impact:U2 next-release P2 reach:R2 size:M
Difficulty 3/5 1-2 days Newbie friendliness 65/100
-
enhancement impact:U3 next-release owner P1 reach:R3 size:M
Difficulty 4/5 Over a week Newbie friendliness 15/100
All issues in timusus/Shuttle2
Similar issues
-
:maddi-inspection-kotlin:test runs out of heap in a full maddi test run; exit 1 with no failing testOpenbuild/ci front-end:kotlin
Difficulty 2/5 1-3 hours Newbie friendliness 62/100
-
Difficulty 2/5 1-3 hours Newbie friendliness 78/100
bisq-network/bisq-mobile#1948 ·
Maintainers usually reply within 1 day
-
afk-ok area:data-quality importer size:S
Difficulty 2/5 1-3 hours Newbie friendliness 74/100
enorm-labs/event-junkie#3301 ·
Maintainers usually reply within 1 day
-
Negate special case for Long literals uses the wrong valuePossibly taken @bryantaustin13 claimed this today. Open
Difficulty 1/5 Under an hour Newbie friendliness 85/100
cqframework/clinical_quality_language#1865 ·
Maintainers usually reply within 8 days
-
MDM: interfaceName cannot be set through managed configurationsPossibly taken @JulienUsson claimed this today. Openbug
Difficulty 1/5 Under an hour Newbie friendliness 82/100
bk138/droidVNC-NG#404 · 1 comment ·