deac/middleman-deploy
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #10 from benben/9_git_deploy_fix

Browse source 
git: remove origin fetching, fixes #9
This commit is contained in:
Tom Vaughan 2013-01-03 04:31:16 -08:00
parent 1877938c8a 6b6f928e75
commit dbc310ec11
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/middleman-deploy/commands.rb
View file

@ -147,11 +147,9 @@ EOF
end
end
`git fetch origin`
#if there is a remote branch with that name, reset to it, otherwise just create a new one
if `git branch -r`.split("\n").keep_if{ |r| r =~ Regexp.new(branch,true) }.count > 0
`git reset --hard origin/#{branch}`
#if there is a branch with that name, switch to it, otherwise create a new one and switch to it
if `git branch`.split("\n").keep_if{ |r| r =~ Regexp.new(branch,true) }.count > 0
`git checkout #{branch}`
else
`git checkout -b #{branch}`
end