Do not filter out branches to fast forward (#2564)

Do not filter out branches to fast forward Should fix #2551 When retriggering propose-downstream for a branch we want to fast forward the merge without filters. Reviewed-by: Laura Barcziová
packit · Oct 4, 2024 · 80956dd · 80956dd
2 parents 87daf58 + ed9b781
commit 80956dd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/packit_service/worker/helpers/sync_release/sync_release.py b/packit_service/worker/helpers/sync_release/sync_release.py
@@ -82,13 +82,12 @@ def get_fast_forward_merge_branches_for(self, source_branch: str) -> Set[str]:
 
         source_branch: source branch
         """
-        branches = aliases.get_fast_forward_merge_branches_for(
+        return aliases.get_fast_forward_merge_branches_for(
             self.job.dist_git_branches,
             source_branch,
             default=self.default_dg_branch,
             default_dg_branch=self.default_dg_branch,
         )
-        return self._filter_override_branches(branches)
 
     @property
     def job(self) -> Optional[JobConfig]:

diff --git a/tests/unit/test_propose_downstream.py b/tests/unit/test_propose_downstream.py
@@ -129,7 +129,6 @@
                     trigger=JobConfigTriggerType.release,
                     packages={
                         "package": CommonPackageConfig(
-                            # no sense but possible!
                             dist_git_branches={
                                 "f41": {"fast_forward_merge_into": ["f40", "f39"]},
                                 "f38": {"fast_forward_merge_into": ["f37"]},
@@ -139,9 +138,9 @@
                 ),
             ],
             JobConfigTriggerType.release,
-            {"f41", "f40"},
             {"f41"},
-            {"f41": {"f40"}},
+            {"f41"},
+            {"f41": {"f40", "f39"}},
         ),
     ],
 )