🚑 Check commit number against upstream branch

webknjaz · webknjaz · commit 0837b5707ac6 · 2025-02-10T17:26:29.000+01:00
Previously, the `git log` command would run against an unresolved branch reference which might point to the wrong thing locally. This patch makes it more predictable by specifying the exact remote branch. Fixes #155.
diff --git a/cherry_picker/cherry_picker.py b/cherry_picker/cherry_picker.py
@@ -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}")
             if len(commits) == 1:
                 commit_message = self.amend_commit_message(cherry_pick_branch)
             else:

Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,7 @@ def continue_cherry_pick(self):`
`636`	`636`	`]`
`637`	`637`	`self.commit_sha1 = get_full_sha_from_short(short_sha)`
`638`	`638`
`639`		`- commits = get_commits_from_backport_branch(base)`
	`639`	`+ commits = get_commits_from_backport_branch(f"{self.upstream_remote}/{base}")`
`640`	`640`	`if len(commits) == 1:`
`641`	`641`	`commit_message = self.amend_commit_message(cherry_pick_branch)`
`642`	`642`	`else:`