fix(cherrypick): report Git's error instead of NotImplementedError - #130
Merged
Conversation
CherrypickCommit raised a bare NotImplementedError for any 'git cherry-pick' exit code other than 0 or 1, so real Git failures (e.g. rc 128 when local changes would be overwritten) surfaced as an opaque traceback instead of the message Git printed. Raise AbortTask with the driver's error text, matching how PullBranch and ApplyStash already report Git failures. Closes jorio#129
Owner
|
Thank you for this fix! |
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
2 participants
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.
Closes #129
CherrypickCommitraised a bareNotImplementedErrorfor anygit cherry-pickexit code other than 0 or 1, so a genuine Git failure (rc 128 when local changes would be overwritten) showed up as an opaque traceback instead of the message Git actually printed. It now raisesAbortTask(driver.htmlErrorText()), matching howPullBranchandApplyStashalready report Git failures.New
testCherrypickGitErrordirties the file the cherry-pick would overwrite; it fails on master and passes with the fix.