Bug 283146

Summary: [EWS] checkout-pull-request fails if there's an empty commit on the branch
Product: WebKit Reporter: Sam Sneddon [:gsnedders] <gsnedders>
Component: Tools / TestsAssignee: Sam Sneddon [:gsnedders] <gsnedders>
Status: RESOLVED FIXED    
Severity: Normal CC: webkit-bug-importer
Priority: P2 Keywords: InRadar
Version: WebKit Nightly Build   
Hardware: Unspecified   
OS: Unspecified   

Sam Sneddon [:gsnedders]
Reported 2024-11-14 16:06:13 PST
See e.g.: https://ews-build.webkit.org/#/builders/55/builds/29455 git cherry-pick HEAD..remotes/gsnedders/drop-old-version_info-36 in dir /Volumes/Data/worker/macOS-Ventura-Release-Build-EWS/build (timeout 600 secs) watching logfiles {} argv: [b'git', b'cherry-pick', b'HEAD..remotes/gsnedders/drop-old-version_info-36'] using PTY: False The previous cherry-pick is now empty, possibly due to conflict resolution. If you wish to commit it anyway, use: git commit --allow-empty Otherwise, please use 'git cherry-pick --skip' On branch drop-old-version_info-36 Cherry-pick currently in progress. (run "git cherry-pick --continue" to continue) (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) nothing to commit, working tree clean program finished with exit code 1 elapsedTime=5.957205 The PR, https://github.com/WebKit/WebKit/pull/29254, currently has an empty commit because it feels worthwhile to have a commit message which outlines what the final, squashed commit message to land will be.
Attachments
Sam Sneddon [:gsnedders]
Comment 1 2024-11-14 16:18:58 PST
Radar WebKit Bug Importer
Comment 2 2024-11-21 16:11:07 PST
EWS
Comment 3 2024-12-03 11:33:26 PST
Committed 287296@main (decff39e8b9d): <https://commits.webkit.org/287296@main> Reviewed commits have been landed. Closing PR #36671 and removing active labels.
Note You need to log in before you can comment on or make changes to this bug.