Use merge origin/<branch> for check run

[myakove]

Summary by CodeRabbit

• Bug Fixes
  • Enhanced the branch integration process to reference remote changes explicitly, ensuring more reliable updates during merge operations.

[myakove-bot]

Report bugs in Issues

The following are automatically added:

• Add reviewers from OWNER file (in the root of the repository) under reviewers section.
• Set PR size label.
• New issue is created for the PR. (Closed when PR is merged/closed)
• Run pre-commit if .pre-commit-config.yaml exists in the repo.

Available user actions:

• To mark PR as WIP comment /wip to the PR, To remove it from the PR comment /wip cancel to the PR.
• To block merging of PR comment /hold, To un-block merging of PR comment /hold cancel.
• To mark PR as verified comment /verified to the PR, to un-verify comment /verified cancel to the PR.
  verified label removed on each new commit push.
• To cherry pick a merged PR comment /cherry-pick <target branch to cherry-pick to> in the PR.
  • Multiple target branches can be cherry-picked, separated by spaces. (/cherry-pick branch1 branch2)
  • Cherry-pick will be started when PR is merged
• To build and push container image command /build-and-push-container in the PR (tag will be the PR number).
  • You can add extra args to the Podman build command
    • Example: /build-and-push-container --build-arg OPENSHIFT_PYTHON_WRAPPER_COMMIT=<commit_hash>
• To add a label by comment use /<label name>, to remove, use /<label name> cancel
• To assign reviewers based on OWNERS file use /assign-reviewers
• To check if PR can be merged use /check-can-merge
• to assign reviewer to PR use /assign-reviewer @<reviewer>

Supported /retest check runs

• /retest tox: Retest tox
• /retest build-container: Retest build-container
• /retest python-module-install: Retest python-module-install
• /retest pre-commit: Retest pre-commit
• /retest all: Retest all

Supported labels

• hold
• verified
• wip
• lgtm

[coderabbitai]

Walkthrough

The pull request updates the Git merge commands in the _prepare_cloned_repo_dir method of the webhook_server_container/libs/github_api.py file. The merge command is modified in two locations to reference the remote branch (origin/{self.pull_request_branch}) instead of the local branch, aiming to ensure the merge operates on the remote repository's branch state.

Changes

File	Change Summary
webhook_server_container/libs/github_api.py	Updated two Git merge commands in the _prepare_cloned_repo_dir method to use origin/{self.pull_request_branch} instead of {self.pull_request_branch}.

Possibly related PRs

• Use merge, not rebase when running check runs #680: Modifies the _prepare_cloned_repo_dir method in github_api.py with similar updates to the merge logic.
• feat: rebase pull request branch on checkout PR #674: Also alters the merge logic in the same method; introduces a git rebase command, directly relating to modifications in this section.

Suggested labels

size/XS, branch-main

Suggested reviewers

• rnetser

---

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 7eaa9da and 87e1c6d.

📒 Files selected for processing (1)

• webhook_server_container/libs/github_api.py (2 hunks)

⏰ Context from checks skipped due to timeout of 90000ms (4)

• GitHub Check: build-container
• GitHub Check: pre-commit
• GitHub Check: python-module-install
• GitHub Check: tox

🔇 Additional comments (2)

webhook_server_container/libs/github_api.py (2)

1695-1695: Improvement to explicitly use remote branch reference

The change from self.pull_request_branch to origin/{self.pull_request_branch} ensures that the merge operation always uses the branch from the remote repository rather than a potentially different local branch. This improves reliability by guaranteeing that the latest remote state is used.

---

1727-1727: Consistent use of remote branch reference

Similar to the previous change, this ensures that the merge operation uses the remote branch reference, maintaining consistency across both code paths in the _prepare_cloned_repo_dir method.

This change helps prevent potential issues where the local and remote branches could be in different states, especially in automation environments where multiple operations might be occurring simultaneously.

✨ Finishing Touches

• 📝 Generate Docstrings

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>, please review it.
  • Generate unit testing code for this file.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai generate unit testing code for this file.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
  • @coderabbitai read src/utils.ts and generate unit testing code.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai generate docstrings to generate docstrings for this PR.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Other keywords and placeholders

• Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
• Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
• Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.