0pdd: 0pdd doesn't handle force pushes
Repository - https://github.com/extsoft/insight.
Steps to reproduce:
- Push new commit
- Amend (
git commit --amend) and push again (git push -f)
Actual:
Email subject: [extsoft/insight] test 0pdd (23420d6)
Body:
I wasn't able to retrieve PDD puzzles from the code base (if you think that it's a bug on your our side, please submit it to yegor256/0pdd:
cd /tmp/0pdd/extsoft/insight && git reset --hard --quiet && git clean --force -d && git pull --quiet: 256 (not zero):
Auto-merging git/git-utils.bash
CONFLICT (add/add): Merge conflict in git/git-utils.bash
Automatic merge failed; fix conflicts and then commit the result.
/app/objects/exec.rb:38:in `run'
/app/objects/git_repo.rb:89:in `pull'
/app/objects/git_repo.rb:67:in `push'
/app/objects/job.rb:41:in `proceed'
/app/objects/job_starred.rb:35:in `proceed'
/app/objects/job_recorded.rb:33:in `proceed'
/app/objects/job_emailed.rb:36:in `proceed'
/app/objects/job_commiterrors.rb:36:in `proceed'
/app/objects/job_detached.rb:51:in `block in exclusive'
/app/vendor/ruby-2.2.2/lib/ruby/2.2.0/timeout.rb:89:in `block in timeout'
/app/vendor/ruby-2.2.2/lib/ruby/2.2.0/timeout.rb:34:in `block in catch'
/app/vendor/ruby-2.2.2/lib/ruby/2.2.0/timeout.rb:34:in `catch'
/app/vendor/ruby-2.2.2/lib/ruby/2.2.0/timeout.rb:34:in `catch'
/app/vendor/ruby-2.2.2/lib/ruby/2.2.0/timeout.rb:104:in `timeout'
/app/objects/job_detached.rb:49:in `exclusive'
/app/objects/job_detached.rb:39:in `block in proceed'
/app/objects/job_detached.rb:39:in `fork'
/app/objects/job_detached.rb:39:in `proceed'
/app/0pdd.rb:201:in `block in <top (required)>'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:1611:in `call'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:1611:in `block in compile!'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:975:in `[]'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:975:in `block (3 levels) in route!'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:994:in `route_eval'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:975:in `block (2 levels) in route!'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:1015:in `block in process_route'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:1013:in `catch'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:1013:in `process_route'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:973:in `block in route!'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:972:in `each'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:972:in `route!'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:1085:in `block in dispatch!'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:1067:in `block in invoke'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:1067:in `catch'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:1067:in `invoke'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:1082:in `dispatch!'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:907:in `block in call!'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:1067:in `block in invoke'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:1067:in `catch'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:1067:in `invoke'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:907:in `call!'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:895:in `call'
/app/vendor/bundle/ruby/2.2.0/gems/rack-protection-1.5.3/lib/rack/protection/xss_header.rb:18:in `call'
/app/vendor/bundle/ruby/2.2.0/gems/rack-protection-1.5.3/lib/rack/protection/path_traversal.rb:16:in `call'
/app/vendor/bundle/ruby/2.2.0/gems/rack-protection-1.5.3/lib/rack/protection/json_csrf.rb:18:in `call'
/app/vendor/bundle/ruby/2.2.0/gems/rack-protection-1.5.3/lib/rack/protection/base.rb:49:in `call'
/app/vendor/bundle/ruby/2.2.0/gems/rack-protection-1.5.3/lib/rack/protection/base.rb:49:in `call'
/app/vendor/bundle/ruby/2.2.0/gems/rack-protection-1.5.3/lib/rack/protection/frame_options.rb:31:in `call'
/app/vendor/bundle/ruby/2.2.0/gems/rack-1.6.5/lib/rack/logger.rb:15:in `call'
/app/vendor/bundle/ruby/2.2.0/gems/rack-1.6.5/lib/rack/commonlogger.rb:33:in `call'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:219:in `call'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:212:in `call'
/app/vendor/bundle/ruby/2.2.0/gems/rack-1.6.5/lib/rack/head.rb:13:in `call'
/app/vendor/bundle/ruby/2.2.0/gems/rack-1.6.5/lib/rack/methodoverride.rb:22:in `call'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:182:in `call'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:2013:in `call'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:1487:in `block in call'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:1787:in `synchronize'
/app/vendor/bundle/ruby/2.2.0/gems/sinatra-1.4.7/lib/sinatra/base.rb:1487:in `call'
/app/vendor/bundle/ruby/2.2.0/gems/rack-1.6.5/lib/rack/handler/webrick.rb:88:in `service'
/app/vendor/ruby-2.2.2/lib/ruby/2.2.0/webrick/httpserver.rb:138:in `service'
/app/vendor/ruby-2.2.2/lib/ruby/2.2.0/webrick/httpserver.rb:94:in `run'
/app/vendor/ruby-2.2.2/lib/ruby/2.2.0/webrick/server.rb:294:in `block in start_thread'
—
About this issue
- Original URL
- State: closed
- Created 7 years ago
- Comments: 17 (8 by maintainers)
Commits related to this issue
- #72 bug with commit amend — committed to yegor256/0pdd by yegor256 7 years ago
- #72 --strategy-option=theirs — committed to yegor256/0pdd by yegor256 7 years ago
- #72 git rebase --abort — committed to yegor256/0pdd by yegor256 7 years ago
- #72 two commits — committed to yegor256/0pdd by yegor256 7 years ago
@extsoft more in #76