diff options
| author | Sam Thursfield <sam@afuera.me.uk> | 2014-09-02 11:39:31 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-11-05 13:27:45 +0000 |
| commit | 6ec86da74646cde7e5c3349e66be3a4751fd40a0 (patch) | |
| tree | 514b179fdb6f8176f52cb5736c3aae5ca4374bd3 | |
| parent | ac9e6787cd2b82bc37b9ba71d09d44aac71f85b1 (diff) | |
| download | morph-6ec86da74646cde7e5c3349e66be3a4751fd40a0.tar.gz | |
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.
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 4 |
1 files changed, 3 insertions, 1 deletions
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)) |