diff options
| author | Zuul <zuul@review.opendev.org> | 2023-01-12 18:13:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-01-12 18:13:54 +0000 |
| commit | 8e69a631f8eaf680782ab37f3c2da872351a1a2d (patch) | |
| tree | c406d5afeb1c620b52d67e5d6a07c12326fa5722 | |
| parent | a643be9a5d4202a3b70336118239e596a1baeec7 (diff) | |
| parent | e53a5c0c11ab1e7d14e612fd89f8c33228d8bca0 (diff) | |
| download | zuul-8e69a631f8eaf680782ab37f3c2da872351a1a2d.tar.gz | |
Merge "Fix scheduleFilesChanges fallback to target branch ref"
| -rw-r--r-- | zuul/manager/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/zuul/manager/__init__.py b/zuul/manager/__init__.py index 313d156e4..aec996f31 100644 --- a/zuul/manager/__init__.py +++ b/zuul/manager/__init__.py @@ -1303,8 +1303,9 @@ class PipelineManager(metaclass=ABCMeta): build_set = item.current_build_set # if base_sha is not available, fallback to branch - to_sha = getattr(item.change, "base_sha", - getattr(item.change, "branch", None)) + to_sha = getattr(item.change, "base_sha", None) + if to_sha is None: + to_sha = getattr(item.change, "branch", None) self.sched.merger.getFilesChanges( item.change.project.connection_name, item.change.project.name, |