search

python / cherry-picker

πŸπŸ’β› Utility script for backporting/cherry-picking CPython changes from master into one of the maintenance branches.
Apache License 2.0
46 stars 38 forks source link

`cherry_picker --continue` after successful run of `cherry_picker --no-push` creates second commit #42

Closed Jackenmen closed 1 year ago

Jackenmen commented 2 years ago

As in the title:

Ξ» python -m cherry_picker --no-push b8fcac989f82e678695bb3024881c01d86bc00b0 3.4
🐍 πŸ’ ⛏

Now backporting 'b8fcac989f82e678695bb3024881c01d86bc00b0' into '3.4'
Branch 'backport-b8fcac9-3.4' set up to track remote branch '3.4' from 'upstream'.
Switched to a new branch 'backport-b8fcac9-3.4'

[backport-b8fcac9-3.4 b1877be9f] Create sss (#30)
 Date: Mon Aug 2 18:47:51 2021 +0200
 1 file changed, 1 insertion(+)
 create mode 100644 sss

Finished cherry-pick b8fcac989f82e678695bb3024881c01d86bc00b0 into backport-b8fcac9-3.4 πŸ˜€
--no-push option used.
... Stopping here.
To continue and push the changes:
    $ cherry_picker --continue

To abort the cherry-pick and cleanup:
    $ cherry_picker --abort

Ξ» python -m cherry_picker --continue
🐍 πŸ’ ⛏
remote:
remote: Create a pull request for 'backport-b8fcac9-3.4' on GitHub by visiting:
remote:      https://github.com/jack1142/Red-DiscordBot/pull/new/backport-b8fcac9-3.4
remote:
To https://github.com/jack1142/Red-DiscordBot
 * [new branch]          backport-b8fcac9-3.4 -> backport-b8fcac9-3.4

Backport PR URL:
https://github.com/Cog-Creators/Red-DiscordBot/compare/3.4...jack1142:backport-b8fcac9-3.4?expand=1
Your branch is up to date with 'origin/V3/develop'.
Switched to branch 'V3/develop'

Deleted branch backport-b8fcac9-3.4 (was b01d61ef4).

branch backport-b8fcac9-3.4 has been deleted.

Backport PR:

[3.4] Create sss (#30).
(cherry picked from commit b8fcac989f82e678695bb3024881c01d86bc00b0)

Co-authored-by: jack1142 <6032823+jack1142@users.noreply.github.com>

This also results in broken formatting on the PR creation page: image