lib/github_cli/commands/merging.rb in github_cli-0.5.9 vs lib/github_cli/commands/merging.rb in github_cli-0.6.0
- old
+ new
@@ -18,15 +18,16 @@
base - Required String - The name of the base branch that the head will be merged into.\n
head - Required String - The head to merge. This can be a branch name or a commit SHA1. \n
commit_message - Optional String - Commit message to use for the merge commit. If omitted, a default message will be used.\n
DESC
def perform(user, repo)
+ global_options = options.dup
params = options[:params].dup
params['base'] = options[:base] if options[:base]
params['head'] = options[:head] if options[:head]
params['commit_message'] = options[:message] if options[:message]
-
- Merging.merge user, repo, params, options[:format]
+ Util.hash_without!(global_options, params.keys + ['params', 'commit_message'])
+ Merging.merge user, repo, params, global_options
end
end # Merging
end # GithubCLI