diff options
| author | Ben Brown <ben@demerara.io> | 2021-10-13 11:03:08 +0000 |
|---|---|---|
| committer | Ben Brown <ben@demerara.io> | 2021-10-13 11:03:08 +0000 |
| commit | c91df88eef95a0a8ad5545d66b0f6ddedbe7da01 (patch) | |
| tree | 34bb25f6f6889c779c0a46411790362ca2e1354f | |
| parent | 0847da03f385337f0303f0d723de7ba58c6329de (diff) | |
| parent | 4367980eab0b7f501ade33a31ef120b6e2cfa73d (diff) | |
| download | lorry-controller-c91df88eef95a0a8ad5545d66b0f6ddedbe7da01.tar.gz | |
Merge branch 'egb/fix_issue_30' into 'master'
Re #30 reset to branch specified in settings
See merge request CodethinkLabs/lorry/lorry-controller!27
| -rw-r--r-- | lorrycontroller/readconf.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lorrycontroller/readconf.py b/lorrycontroller/readconf.py index b488765..c833645 100644 --- a/lorrycontroller/readconf.py +++ b/lorrycontroller/readconf.py @@ -131,8 +131,9 @@ class ReadConfiguration(lorrycontroller.LorryControllerRoute): # Now move the current HEAD to wherever the remote master # branch is, no questions asked. This doesn't do merging # or any of the other things we don't want in this situation. + origin_branch = 'origin/' + self.app_settings['confgit-branch'] cliapp.runcmd( - ['git', 'reset', '--hard', 'origin/master'], cwd=confdir) + ['git', 'reset', '--hard', origin_branch], cwd=confdir) @property def config_file_name(self): |