summaryrefslogtreecommitdiff
path: root/morphlib/plugins/branch_and_merge_new_plugin.py
diff options
context:
space:
mode:
Diffstat (limited to 'morphlib/plugins/branch_and_merge_new_plugin.py')
-rw-r--r--morphlib/plugins/branch_and_merge_new_plugin.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/morphlib/plugins/branch_and_merge_new_plugin.py b/morphlib/plugins/branch_and_merge_new_plugin.py
index e09417d2..9594d224 100644
--- a/morphlib/plugins/branch_and_merge_new_plugin.py
+++ b/morphlib/plugins/branch_and_merge_new_plugin.py
@@ -137,8 +137,7 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin):
sb = morphlib.sysbranchdir.create(
root_dir, root_url, system_branch)
- gd = sb.clone_cached_repo(
- cached_repo, system_branch, system_branch)
+ gd = sb.clone_cached_repo(cached_repo, system_branch)
if not self._checkout_has_systems(gd):
raise BranchRootHasNoSystemsError(root_url, system_branch)
@@ -211,7 +210,7 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin):
sb = morphlib.sysbranchdir.create(
root_dir, root_url, system_branch)
- gd = sb.clone_cached_repo(cached_repo, system_branch, base_ref)
+ gd = sb.clone_cached_repo(cached_repo, base_ref)
gd.branch(system_branch, base_ref)
gd.checkout(system_branch)