Skip to content

Commit

Permalink
Fixed push commands for newer version of Git
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Schaefermeyer committed Mar 5, 2012
1 parent 9d67b14 commit 52cef36
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/gitcycle.rb
Original file line number Diff line number Diff line change
Expand Up @@ -550,9 +550,9 @@ def checkout_remote_branch(options={})

if branches(:match => target)
if yes?("You already have a branch called '#{target}'. Overwrite?")
run("git push origin :#{target} -q")
run("git push origin :#{target}")
run("git checkout master -q")
run("branch -D #{target}")
run("git branch -D #{target}")
else
run("git checkout #{target} -q")
run("git pull origin #{target} -q")
Expand All @@ -574,7 +574,7 @@ def checkout_remote_branch(options={})
end

puts "Pushing 'origin/#{target}'.\n".green
run("git push origin #{target} -q")
run("git push origin #{target}")
end

def collab?(branch)
Expand Down

0 comments on commit 52cef36

Please sign in to comment.