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

add exitstatus to debug merging pull requests

This commit is contained in:
Alexander Machehin 2013-03-25 16:34:37 +06:00
parent 8fa9b4ad3b
commit 4d046dd990
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/pull_request.rb
View File

@ -87,7 +87,7 @@ class PullRequest < ActiveRecord::Base
system("git reset --hard HEAD^") # for diff maybe FIXME system("git reset --hard HEAD^") # for diff maybe FIXME
if old_commit.id == to_project.repo.commits(to_ref).first.id if old_commit.id == to_project.repo.commits(to_ref).first.id
raise "merge result pull_request #{id}: #{res}; #{res2}" raise "merge result pull_request #{id}: #{$?.exitstatus}; #{res2}; #{res}"
end end
set_user_and_time who set_user_and_time who
merging merging