From 4367980eab0b7f501ade33a31ef120b6e2cfa73d Mon Sep 17 00:00:00 2001 From: Ellis Barnwell Date: Wed, 13 Oct 2021 11:51:34 +0100 Subject: Reset to the branch supplied in the config --- lorrycontroller/readconf.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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): -- cgit v1.2.1