Merge pull request f4pga#1798 from litghost/update_tools_to_handle_no…

…_wip Handle case when there are no wip/ branches.
mithro · Nov 30, 2020 · 848c29a · 848c29a
2 parents 0e92815 + 7f314bd
commit 848c29a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/utils/update_tools/update_tools.py b/utils/update_tools/update_tools.py
@@ -201,8 +201,11 @@ def main():
 
     revert_to_master(g, repo, remote)
 
-    branches_string = ' '.join(branches)
-    result = merge_branches(location, branches_string)
+    if branches:
+        branches_string = ' '.join(branches)
+        result = merge_branches(location, branches_string)
+    else:
+        result = True
 
     if not result:
         revert_to_master(g, repo, remote)