CLI: Add reset-hard option to "update" command

voxpupuli · Dec 16, 2020 · a55759e · a55759e
1 parent d9b8c93
commit a55759e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/lib/modulesync.rb b/lib/modulesync.rb
@@ -116,6 +116,8 @@ def self.manage_module(puppet_module, module_files, module_options, defaults, op
       Git.pull(options[:git_base], git_repo, options[:branch], options[:project_root], module_options || {})
     end
 
+    repo.reset_hard(options[:reset_hard]) if options[:reset_hard]
+
     module_configs = Util.parse_config(module_file(options[:project_root], namespace, module_name, MODULE_CONF_FILE))
     settings = Settings.new(defaults[GLOBAL_DEFAULTS_KEY] || {},
                             defaults,

diff --git a/lib/modulesync/cli.rb b/lib/modulesync/cli.rb
@@ -85,6 +85,8 @@ class Base < Thor # rubocop:disable Metrics/ClassLength
              :type => :boolean,
              :desc => 'Force push amended commit',
              :default => false
+      option :reset_hard,
+             :desc => 'Hard-reset on specified branch (e.g. origin/master) before updating modules'
       option :noop,
              :type => :boolean,
              :desc => 'No-op mode',