Skip to content

Add new automerge flag #742

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

Open
HugoSilvaSantos wants to merge 2 commits into
base: arm-software
Choose a base branch
from
Open

Add new automerge flag #742

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5a6c40
Add new automerge flag
HugoSilvaSantos Feb 24, 2026
da4fd01
Update flag name
HugoSilvaSantos Feb 24, 2026
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
32 changes: 29 additions & 3 deletions arm-software/ci/automerge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,14 +173,35 @@ def process_conflict(
create_pull_request(git_repo, to_branch)


def get_merge_commit_list(git_repo: Git, from_branch: str, to_branch: str) -> list[str]:
def get_merge_commit_list(git_repo: Git, from_branch: str, to_branch: str, up_to_commit: str = None) -> list[str]:
logger.info(
"Calculating list of commits to be merged from %s to %s", from_branch, to_branch
)
merge_base_output = git_repo.run_cmd(["merge-base", from_branch, to_branch])
merge_base_commit = merge_base_output.strip()

# Determine the end point for the merge range
end_point = from_branch
if up_to_commit:
# Resolve the commit/tag to a full commit hash
resolved_commit = git_repo.run_cmd(["rev-parse", up_to_commit]).strip()
logger.info("Resolved '%s' to commit %s", up_to_commit, resolved_commit)

# Verify that the commit is reachable from from_branch
try:
git_repo.run_cmd(["merge-base", "--is-ancestor", resolved_commit, from_branch])
except subprocess.CalledProcessError:
logger.error(
"The specified commit '%s' (%s) is not reachable from branch '%s'",
up_to_commit, resolved_commit, from_branch
)
raise ValueError(f"Commit '{up_to_commit}' is not in the history of '{from_branch}'")

end_point = resolved_commit
logger.info("Limiting merge to commits up to and including %s", end_point)

log_output = git_repo.run_cmd(
["log", f"{merge_base_commit}..{from_branch}", "--pretty=format:%H"]
["log", f"{merge_base_commit}..{end_point}", "--pretty=format:%H"]
)
commit_list = log_output.strip()
if not commit_list:
Expand Down Expand Up @@ -248,6 +269,11 @@ def main():
action="store_true",
help="Print verbose log messages during automerge run",
)
arg_parser.add_argument(
"--up-to-commit",
metavar="COMMIT_OR_TAG",
help="Merge commits only up to and including this commit hash or tag (must be reachable from --from-branch)",
)

args = arg_parser.parse_args()

Expand All @@ -270,7 +296,7 @@ def main():
ignored_paths = ignored_paths_file.read().splitlines()

merge_commits = get_merge_commit_list(
git_repo, args.from_branch, args.to_branch
git_repo, args.from_branch, args.to_branch, args.up_to_commit
)
for commit_hash in merge_commits:
merge_commit(
Expand Down