Skip to content
Browse files

Change how options hash is passed into update

  • Loading branch information...
1 parent f1e8883 commit 6c8935ceb8885ecb528ef4cc896c9d941db61be6 @wingrunr21 committed
Showing with 2 additions and 3 deletions.
  1. +2 −3 lib/gitolite/gitolite_admin.rb
View
5 lib/gitolite/gitolite_admin.rb
@@ -118,9 +118,8 @@ def save_and_apply(commit_message = DEFAULT_COMMIT_MSG)
end
# Updates the repo with changes from remote master
- def update(*args)
- options = {:reset => true, :rebase => false}
- options.merge! args.first || {}
+ def update(options = {})
+ options = {:reset => true, :rebase => false }.merge(options)
reset! if options[:reset]

0 comments on commit 6c8935c

Please sign in to comment.
Something went wrong with that request. Please try again.