From b30cb34be523de47de2eaaa42e38ca67b533521c Mon Sep 17 00:00:00 2001 From: Lukas Petr Date: Tue, 10 Mar 2026 23:39:47 +0100 Subject: [PATCH] commits: Fix pulling new changes Pulling new changes failed because of divergent branches [1]. I am not exactly sure why -- if the project (in this case bpf-next) changes history of the master branch or what happend, but this should fix it. [1] https://github.com/diffkemp/diffkemp-automation/issues/18 --- backend/automation/models/projects/commits.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/automation/models/projects/commits.py b/backend/automation/models/projects/commits.py index c9c0990..d49a652 100644 --- a/backend/automation/models/projects/commits.py +++ b/backend/automation/models/projects/commits.py @@ -25,7 +25,7 @@ def __init__( self.commit_prefixes = config["commit-prefixes"] def pull_changes(self) -> None: - self.repo.remote().pull() + self.repo.remote().pull(rebase=True) def get_commits_to_compare(self, initial_comparison: int = 3) -> list[str]: """Returns SHA of commits that should be analyzed ordered from oldest