summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lorrycontroller/readconf.py3
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):