Adding force(--f) support for the push command

robertodecurnex · robertodecurnex · commit b36b6fb4b321 · 2014-01-13T16:21:50.000-03:00
closes ruby-git#113
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -341,8 +341,11 @@ def fetch(remote = 'origin')
     #
     #  @git.config('remote.remote-name.push', 'refs/heads/master:refs/heads/master')
     #
-    def push(remote = 'origin', branch = 'master', tags = false)
-      self.lib.push(remote, branch, tags)
+    def push(remote = 'origin', branch = 'master', opts = {})
+      # Small hack to keep backwards compatibility with the 'push(remote, branch, tags)' method signature.
+      opts = {tags: opts} if [true, false].include?(opts)
+
+      self.lib.push(remote, branch, opts)
     end
     
     # merges one or more branches into the current working branch
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -571,9 +571,16 @@ def fetch(remote)
       command('fetch', remote)
     end
     
-    def push(remote, branch = 'master', tags = false)
-      command('push', [remote, branch])
-      command('push', ['--tags', remote]) if tags
+    def push(remote, branch = 'master', opts = {})
+      # Small hack to keep backwards compatibility with the 'push(remote, branch, tags)' method signature.
+      opts = {tags: opts} if [true, false].include?(opts) 
+      
+      arr_opts = []
+      arr_opts << '--f'    if opts[:force] || opts[:f]
+      arr_opts << remote
+
+      command('push', arr_opts + [branch])
+      command('push', ['--tags'] + arr_opts) if opts[:tags]
     end
 
     def pull(remote='origin', branch='master')

Original file line number	Diff line number	Diff line change
`@@ -341,8 +341,11 @@ def fetch(remote = 'origin')`
`341`	`341`	`#`
`342`	`342`	`# @git.config('remote.remote-name.push', 'refs/heads/master:refs/heads/master')`
`343`	`343`	`#`
`344`		`- def push(remote = 'origin', branch = 'master', tags = false)`
`345`		`- self.lib.push(remote, branch, tags)`
	`344`	`+ def push(remote = 'origin', branch = 'master', opts = {})`
	`345`	`+ # Small hack to keep backwards compatibility with the 'push(remote, branch, tags)' method signature.`
	`346`	`+ opts = {tags: opts} if [true, false].include?(opts)`
	`347`	`+`
	`348`	`+ self.lib.push(remote, branch, opts)`
`346`	`349`	`end`
`347`	`350`
`348`	`351`	`# merges one or more branches into the current working branch`