fix(ci): quote fresh merge base ref - #112
Merged
Merged
Conversation
Adding .gitkeep for PR creation (default mode). This file will be removed when the task is complete. Issue: #111
konard
changed the title
konard
marked this pull request as ready for review
July 21, 2026 06:27
Member
Author
Working session summaryImplemented and finalized PR #112.
This summary was automatically extracted from the AI working session output. |
Member
Author
🤖 Solution Draft LogThis log file contains the complete execution trace of the AI solution draft process. 💰 Cost estimation:
📊 Context and tokens usage:
Total: (104.7K + 1.6M cached) input tokens, 8.3K output tokens, $3.005102 cost 🤖 Models used:
📎 Log file uploaded as Gist (1261KB)Now working session is ended, feel free to review and add any feedback on the solution draft. |
Member
Author
🎉 Auto-mergedThis pull request has been automatically merged by hive-mind.
Auto-merged by hive-mind with --auto-merge flag |
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.
Fixes #111
Problem
scripts/simulate-fresh-merge.shpassedBASE_REFunquoted to bothgit rev-listandgit merge. Shell word splitting could therefore change the intended revision argument and prevent the fresh-merge conflict check from operating on the requested base ref.Solution
HEAD..origin/$BASE_REFin the behind-count command.origin/$BASE_REFin the simulated merge command.Reproduction / tests
The new test fails against the previous script because neither quoted command is present, then passes with this change.
Local verification:
node --test --test-timeout=30000 tests/simulate-fresh-merge.test.jsbash -n scripts/simulate-fresh-merge.shnode scripts/check-changesets.mjsnpm run lintnpm run format:checknpm run check:duplicationnpm test— 182 tests passedThe branch includes the latest
origin/main, and the working tree is clean.