diff options
| -rw-r--r-- | morphlib/git.py | 3 | ||||
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/morphlib/git.py b/morphlib/git.py index 3b9c4240..88c6dae3 100644 --- a/morphlib/git.py +++ b/morphlib/git.py @@ -214,7 +214,8 @@ def check_config_set(runcmd, keys, cwd='.'): found = {} for key in keys: try: - value = runcmd(['git', 'config', key], cwd=cwd, print_command=False).strip() + value = runcmd(['git', 'config', key], cwd=cwd, + print_command=False).strip() found[key] = value except cliapp.AppException: missing.append(key) diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index bad2e9de..f7109bcf 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -180,18 +180,22 @@ class BranchAndMergePlugin(cliapp.Plugin): def set_branch_config(self, branch_dir, option, value): filename = os.path.join(branch_dir, '.morph-system-branch', 'config') - self.app.runcmd(['git', 'config', '-f', filename, option, value], print_command=False) + self.app.runcmd(['git', 'config', '-f', filename, option, value], + print_command=False) def get_branch_config(self, branch_dir, option): filename = os.path.join(branch_dir, '.morph-system-branch', 'config') - value = self.app.runcmd(['git', 'config', '-f', filename, option], print_command=False) + value = self.app.runcmd(['git', 'config', '-f', filename, option], + print_command=False) return value.strip() def set_repo_config(self, repo_dir, option, value): - self.app.runcmd(['git', 'config', option, value], cwd=repo_dir, print_command=False) + self.app.runcmd(['git', 'config', option, value], cwd=repo_dir, + print_command=False) def get_repo_config(self, repo_dir, option): - value = self.app.runcmd(['git', 'config', option], cwd=repo_dir, print_command=False) + value = self.app.runcmd(['git', 'config', option], cwd=repo_dir, + print_command=False) return value.strip() def get_head(self, repo_path): |