Skip to content

Check commit count against upstream #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hugovk merged 2 commits into from
Aug 15, 2025
Merged

Check commit count against upstream #156

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0837b57
🚑 Check commit number against upstream branch
webknjaz Feb 10, 2025
fbc8b5c
Access computed `upstream` property instead of `upstream_remote`
webknjaz Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cherry_picker/cherry_picker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ def continue_cherry_pick(self):
]
self.commit_sha1 = get_full_sha_from_short(short_sha)

commits = get_commits_from_backport_branch(base)
commits = get_commits_from_backport_branch(f"{self.upstream_remote}/{base}")
Comment thread
webknjaz marked this conversation as resolved.
Outdated
if len(commits) == 1:
commit_message = self.amend_commit_message(cherry_pick_branch)
else:
Expand Down