From 6ec86da74646cde7e5c3349e66be3a4751fd40a0 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 2 Sep 2014 11:39:31 +0000 Subject: Make branch and merge commands honour --no-git-update Previously they would do `git remote update --prune` after creating the system branch, without checking for the --no-git-update flag. --- morphlib/plugins/branch_and_merge_plugin.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 5531f7f6..b7d22f43 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -121,7 +121,9 @@ class BranchAndMergePlugin(cliapp.Plugin): yield (sb, gd) gd.update_submodules(self.app) - gd.update_remotes() + + if not self.app.settings['no-git-update']: + gd.update_remotes() except morphlib.sysbranchdir.SystemBranchDirectoryAlreadyExists as e: logging.error('Caught exception: %s' % str(e)) -- cgit v1.2.1