Skip to content

fix(sandbox-versions): repoint ZED_COMMIT to merge commit (fetch-by-SHA fix) - #2562

Merged
chocobar merged 1 commit into
mainfrom
fix/bump-zed-merge-sha
Jun 9, 2026
Merged

chocobar merged 1 commit into
mainfrom
fix/bump-zed-merge-sha

Conversation

@chocobar

@chocobar chocobar commented Jun 9, 2026

Copy link
Copy Markdown
Collaborator

Summary

Build 1943 stage 5 (build-sandbox-amd64) failed at clone-dependencies:

```
fatal: remote error: upload-pack: not our ref e4c36d837cb71ee10a26d8617be770fa75b9c25d
```

GitHub's `upload-pack` only serves refs (HEAD, branches, tags) or commits explicitly reachable from one via `uploadpack.allowReachableSHA1InWant`. By default it rejects fetch-by-SHA for arbitrary internal commits. The previous bump in #2559 pinned the branch commit (the last commit on the merged feature branch) rather than the merge commit on `zed/main`, so `clone-dependencies`' `git fetch --depth 1 ` was rejected.

Fix

Repoint `ZED_COMMIT` to `ecdc2ea67d5f731c3babc3d1f17bf10b2eb1825d` — the merge commit of helixml/zed#60, reachable from `zed/main`.

Pattern for future ZED_COMMIT bumps

Use the merge commit on `zed/main` (`git rev-parse origin/main` after pulling), not the feature branch tip. Worth a future tweak to `scripts/` or the CI step to validate this automatically, but that's out of scope here.

Test plan

  • Drone build green on this branch; specifically stage 5/2 (clone-dependencies) clones successfully
  • zed-e2e-test step passes (this is what we were trying to fix in the first place)

🤖 Generated with Claude Code

…HA fix)

Build 1943 stage 5 (build-sandbox-amd64) failed at clone-dependencies:

  fatal: remote error: upload-pack: not our ref e4c36d837cb71ee10a26d8617be770fa75b9c25d

GitHub's upload-pack only allows fetching refs (HEAD, branches, tags) or
commits explicitly reachable from one via uploadpack.allowReachableSHA1InWant.
By default it rejects fetch-by-SHA for arbitrary internal commits. The
previous bump in #2559 pinned the branch commit (the last commit on the
merged feature branch) rather than the merge commit on zed/main, so
clone-dependencies' `git fetch --depth 1 <sha>` was rejected.

Repoint to the merge commit (helixml/zed@ecdc2ea67d, "Merge pull request
#60") which is reachable from origin/main and therefore fetchable.

Pattern to follow for future ZED_COMMIT bumps: use the merge commit on
zed/main (`git rev-parse origin/main` after pulling), not the feature
branch tip.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@chocobar
chocobar merged commit b2f3fd7 into main Jun 9, 2026
1 check passed
@chocobar
chocobar deleted the fix/bump-zed-merge-sha branch June 9, 2026 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant