merge queue: queuing main (13235d0) and #1619 together#1638
Closed
mergify[bot] wants to merge 3 commits into
Closed
merge queue: queuing main (13235d0) and #1619 together#1638mergify[bot] wants to merge 3 commits into
mergify[bot] wants to merge 3 commits into
Conversation
Ambiguous <COMMIT> resolution lost the "ambiguous" wording, the match count, each candidate's Change-Id, and used a 7-char SHA instead of 12. A no-match note target returned InvalidState (exit 7) instead of StackNotFound (3), and `stack open` on an empty stack exited 0 instead of 3, breaking $?-based detection. Add a shared match_commit helper (one copy of the Python reorder.py wording) used by drop/squash/fixup/edit/move/reword/reorder/note, and fix the two exit codes. Also restore the remediation guidance Python printed: the `targets itself` error (sync/push/list) regains the remote URL and both `git branch` fix commands, and the trunk-not-resolvable error regains the concrete `--set-upstream-to` hint. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Change-Id: I527938955f9a8b683f5c172d330a9faaea4517d5
HTTP error rendering dumped the raw response body — so a Mergify API `{"detail": "..."}` envelope reached the user verbatim — and never showed which URL failed. Extract the JSON `detail` field when present (falling back to the raw body), and append a trailing `url:` line on HTTP errors plus the contacted URL on network/timeout errors, matching the Python check_for_status output.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Change-Id: I76d98c2d9a91d6ba5ad1747c91c56d4e1ade869f
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.
🎉 This pull request has been checked successfully and will be merged soon. 🎉
Branch main (13235d0) and #1619 are queued together for merge.
This pull request has been created by Mergify to check the mergeability of #1619.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue rule
defaultfor merge:depends-on = Mergifyio/mergify-cli#1618[⛓️ fix(stack): restore prefix-match error detail and not-found exit codes #1618]title ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?:#approved-reviews-by>=2author = dependabot[bot]author = mergify-ci-botauthor = renovate[bot]body ~= (?ms:.{48,})#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0check-success=ci-gateRequired conditions to stay in the queue:
base=maindepends-on = Mergifyio/mergify-cli#1618[⛓️ fix(stack): restore prefix-match error detail and not-found exit codes #1618]label!=manual mergetitle ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?:#approved-reviews-by>=2author = dependabot[bot]author = mergify-ci-botauthor = renovate[bot]body ~= (?ms:.{48,})#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0check-success=ci-gate