From 87e1c6d08e2f4b976e93a204646018d6802d2593 Mon Sep 17 00:00:00 2001 From: Meni Yakove Date: Thu, 6 Mar 2025 17:32:43 +0200 Subject: [PATCH] Use merge origin/ for check run --- webhook_server_container/libs/github_api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webhook_server_container/libs/github_api.py b/webhook_server_container/libs/github_api.py index bd42c75b..f800ef98 100644 --- a/webhook_server_container/libs/github_api.py +++ b/webhook_server_container/libs/github_api.py @@ -1692,7 +1692,7 @@ def _prepare_cloned_repo_dir( if getattr(self, "pull_request", None): rc, out, err = run_command( - f"{git_cmd} merge {self.pull_request_branch} -m 'Merge {self.pull_request_branch}'", + f"{git_cmd} merge origin/{self.pull_request_branch} -m 'Merge {self.pull_request_branch}'", log_prefix=self.log_prefix, ) if not rc: @@ -1724,7 +1724,7 @@ def _prepare_cloned_repo_dir( if getattr(self, "pull_request", None): rc, out, err = run_command( - f"{git_cmd} merge {self.pull_request_branch} -m 'Merge {self.pull_request_branch}'", + f"{git_cmd} merge origin/{self.pull_request_branch} -m 'Merge {self.pull_request_branch}'", log_prefix=self.log_prefix, ) if not rc: