Report which patch failed to apply - #8
Merged
Merged
Conversation
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
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.
When
refresh_patcheshits a patch that will not apply, it reports only an exit code. The name of the patch is lost, which is the one thing you need.quiet()is"$@" >/dev/null, and quilt writes its diagnostics to stdout:All of that goes to
/dev/null; only the exit code survives. This is visible in the last run of the Code update workflow before #6 removed it (35404425408):Failedwith no indication of what failed. Identifying the patch that broke against 1.138.0 meant reading the run log and still coming up short.The output is now captured and printed when the push fails. The exit code and the exit-2 "no more patches to apply" path are unchanged, so the only difference is what gets printed on the failure path. Verified against a synthetic two-patch stack with a deliberately conflicting base: the failing patch is named, and a clean stack still exits 2 and prints nothing.
This matters more now than it did. With the workflow gone,
update-vscode.shruns by hand — which is exactly when you are untangling a conflicted stack after an upstream merge, and least able to consult a CI log.Deliberately not changed:
apply_patchesandunapply_patchesuse the samequietwrapper and have the same blind spot. They are left alone here to keep this to the path that actually bit us; worth the same treatment if you want it.🤖 Generated with Claude Code