aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2022-09-23 12:14:50 +0200
committerosmith <osmith@sysmocom.de>2022-10-06 07:44:31 +0000
commitba8df68397526ca0e6a390fec754c12d219adc8e (patch)
tree73ac9d23128fd4121ad39f07c8a9bbfc0b10ade4
parent581a7ea879a449ae126ce6ae794a4409ed4eb179 (diff)
obs: lib.git.get_default_branch: add function
Refactor checkout_default_branch so the get_default_branch logic can be used from another function in a future patch. Related: OS#2385 Change-Id: If3f0ab500ff165d81f61b19ad41af90bd39dce8f
-rw-r--r--scripts/obs/lib/git.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/obs/lib/git.py b/scripts/obs/lib/git.py
index 8dc57ae..aab0533 100644
--- a/scripts/obs/lib/git.py
+++ b/scripts/obs/lib/git.py
@@ -65,11 +65,14 @@ def checkout_from_review(project, gerrit_id):
lib.run_cmd(["git", "review", "-d", str(gerrit_id)], cwd=repo_path)
-def checkout_default_branch(project):
- branch = lib.config.git_branch_default
+def get_default_branch(project):
if project in lib.config.git_branch_other:
- branch = lib.config.git_branch_other[project]
+ return lib.config.git_branch_other[project]
+ return lib.config.git_branch_default
+
+def checkout_default_branch(project):
+ branch = get_default_branch(project)
checkout(project, f"origin/{branch}")