Closed
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Your free trial has ended. If you'd like to continue receiving code reviews, you can add a payment method here.
📝 WalkthroughWalkthroughUpdates ghostty submodule pointer to incorporate recent upstream commits including OSC 99 parser, macOS display fixes, and zsh Pure-style prompt redraw markers. Synchronizes fork documentation with new commit hashes and updates checksum mapping for verification. Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~8 minutes Possibly related PRs
Suggested labels
Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
📝 Coding Plan
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@ghostty`:
- Line 1: The parent repo's submodule pointer for ghostty references a
non-existent commit (3cc60d5e399d9f2985f64155f451808afd876a4c); fix this by
pushing that commit (or the intended commit) to the manaflow-ai/ghostty fork's
main branch, then update the submodule pointer in the parent repo to reference a
commit that actually exists on origin/main and is an ancestor of origin/main;
verify with git fetch && git branch --contains <commit> (or git log origin/main
--ancestry-path) that 3cc60d5e... is present on the fork's main branch before
committing the updated submodule gitlink and merging the PR.
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro
Run ID: 88fb0035-ae7a-4e50-8c13-6f1ff9a2f074
📒 Files selected for processing (3)
docs/ghostty-fork.mdghosttyscripts/ghosttykit-checksums.txt
| @@ -1 +1 @@ | |||
| Subproject commit bc9be90a21997a4e5f06bf15ae2ec0f937c2dc42 | |||
| Subproject commit 3cc60d5e399d9f2985f64155f451808afd876a4c | |||
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
# Description: Verify the submodule commit is properly on the fork's main branch
# and that related files were updated in this PR.
echo "=== Checking if submodule commit is on manaflow-ai/ghostty main branch ==="
cd ghostty || exit 1
# Fetch latest from the fork
git fetch origin main
# Check if the commit exists
if ! git cat-file -e 3cc60d5e399d9f2985f64155f451808afd876a4c^{commit} 2>/dev/null; then
echo "❌ ERROR: Commit 3cc60d5e399d9f2985f64155f451808afd876a4c does not exist in the submodule"
exit 1
fi
# Verify it's an ancestor of origin/main (as per learnings)
if git merge-base --is-ancestor 3cc60d5e399d9f2985f64155f451808afd876a4c origin/main; then
echo "✅ Commit is an ancestor of origin/main"
else
echo "❌ ERROR: Commit is NOT an ancestor of origin/main (may be detached HEAD or temp branch)"
exit 1
fi
cd ..
echo ""
echo "=== Checking related files were updated in this PR ==="
# Check if docs/ghostty-fork.md was updated
if git diff --name-only HEAD^ HEAD | grep -q "docs/ghostty-fork.md"; then
echo "✅ docs/ghostty-fork.md was updated"
else
echo "❌ WARNING: docs/ghostty-fork.md was NOT updated (should be per learnings)"
fi
# Check if checksum file was updated
if git diff --name-only HEAD^ HEAD | grep -q "scripts/ghosttykit-checksums.txt"; then
echo "✅ scripts/ghosttykit-checksums.txt was updated"
else
echo "❌ WARNING: scripts/ghosttykit-checksums.txt was NOT updated"
fiRepository: manaflow-ai/cmux
Length of output: 327
The submodule pointer references a non-existent commit.
Commit 3cc60d5e399d9f2985f64155f451808afd876a4c does not exist in the ghostty submodule. Per learnings, submodule commits must be pushed to the manaflow-ai/ghostty fork's main branch before the parent repo pointer is updated. The commit must be verified to exist and be an ancestor of origin/main before merging this PR.
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@ghostty` at line 1, The parent repo's submodule pointer for ghostty
references a non-existent commit (3cc60d5e399d9f2985f64155f451808afd876a4c); fix
this by pushing that commit (or the intended commit) to the manaflow-ai/ghostty
fork's main branch, then update the submodule pointer in the parent repo to
reference a commit that actually exists on origin/main and is an ancestor of
origin/main; verify with git fetch && git branch --contains <commit> (or git log
origin/main --ancestry-path) that 3cc60d5e... is present on the fork's main
branch before committing the updated submodule gitlink and merging the PR.
Contributor
Author
|
Superseded by #1484, which redoes this sync from a fresh non-issue branch. |
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
ghosttysubmodule frombc9be90a21997a4e5f06bf15ae2ec0f937c2dc42to3cc60d5e399d9f2985f64155f451808afd876a4cafter rebasing the fork onto current upstreammaindocs/ghostty-fork.mdto the new retained patch stack and conflict notesGhosttyKit.xcframeworkrelease checksum forxcframework-3cc60d5e399d9f2985f64155f451808afd876a4cTesting
zig build -Demit-xcframework=true -Demit-macos-app=false -Dxcframework-target=universal -Doptimize=ReleaseFastinghosttyGHOSTTY_SHA=3cc60d5e399d9f2985f64155f451808afd876a4c ./scripts/download-prebuilt-ghosttykit.shverified the uploaded release asset against the pinned checksum./scripts/setup.sh./scripts/reload.sh --tag issue-824-ghostty-syncIssues
Summary by cubic
Rebased our
ghosttyfork onto upstream main, updated the fork notes to reflect the retained patch stack, and pinned the matchingGhosttyKit.xcframeworkchecksum. This keeps cmux aligned with upstream and makes xcframework downloads reproducible.Written for commit 30d6e71. Summary will update on new commits.
Summary by CodeRabbit
Documentation
Chores