Merge pull request #288 from voxpupuli/execute-on-default-branch

voxpupuli · Jun 22, 2024 · 2d8a214 · 2d8a214
2 parents f52b2c1 + ecd1b4f
commit 2d8a214
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/modulesync.rb b/lib/modulesync.rb
@@ -209,7 +209,11 @@ def self.execute(cli_options)
       $stdout.puts "#{puppet_module.given_name}:"
 
       puppet_module.repository.clone unless puppet_module.repository.cloned?
-      puppet_module.repository.switch branch: @options[:branch]
+      if @options[:default_branch]
+        puppet_module.repository.switch branch: false
+      else
+        puppet_module.repository.switch branch: @options[:branch]
+      end
 
       command_args = cli_options[:command_args]
       local_script = File.expand_path command_args[0]

diff --git a/lib/modulesync/cli.rb b/lib/modulesync/cli.rb
@@ -175,6 +175,11 @@ def update
              aliases: '-b',
              desc: 'Branch name to make the changes in.',
              default: CLI.defaults[:branch]
+      option :default_branch,
+             aliases: '-B',
+             type: :boolean,
+             desc: 'Work on the default branch (take precedence over --branch).',
+             default: false
       option :fail_fast,
              type: :boolean,
              desc: 'Abort the run after a command execution failure',