summaryrefslogtreecommitdiff
path: root/morphlib/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'morphlib/plugins')
-rw-r--r--morphlib/plugins/branch_and_merge_plugin.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py
index 7fd30420..2c5d1847 100644
--- a/morphlib/plugins/branch_and_merge_plugin.py
+++ b/morphlib/plugins/branch_and_merge_plugin.py
@@ -1345,8 +1345,9 @@ class BranchAndMergePlugin(cliapp.Plugin):
if branch is None:
self.app.output.write("System branches in current workspace:\n")
- for dirname in self.walk_special_directories(
- workspace, special_subdir='.morph-system-branch'):
+ branch_dirs = sorted(self.walk_special_directories(
+ workspace, special_subdir='.morph-system-branch'))
+ for dirname in branch_dirs:
branch = self.get_branch_config(dirname, 'branch.name')
self.app.output.write(" %s\n" % branch)
return