Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

restore pull request fetching

This commit is contained in:
Alexander Machehin 2013-06-18 08:11:20 +06:00
parent 37003f8f0c
commit 532fca43dd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/pull_request.rb
View File

@ -194,8 +194,8 @@ class PullRequest < ActiveRecord::Base
system 'git', 'reset', '--hard', "origin/#{to_ref}" system 'git', 'reset', '--hard', "origin/#{to_ref}"
end end
unless tags.include? from_ref unless tags.include? from_ref
system 'git', 'checkout', from_branch system 'git', 'branch', '-D', from_branch
system 'git', 'reset', '--hard', "#{head}/#{from_ref}" system 'git', 'fetch', head, "+#{from_ref}:#{from_branch}"
system 'git', 'checkout', to_ref system 'git', 'checkout', to_ref
end end
end end