Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix PR merge error #3421

Merged
merged 2 commits into from
Jan 29, 2018
Merged

Fix PR merge error #3421

merged 2 commits into from
Jan 29, 2018

Conversation

ethantkoenig
Copy link
Member

Fix a bug where we used to look for commits between the merge commit and base commit in the head repo (where the merge commit does not exist). This led to spurious error messages (e.g. see line 1069 of https://drone.gitea.io/go-gitea/gitea/3392/9)

@lafriks lafriks added this to the 1.4.0 milestone Jan 28, 2018
@tboerger tboerger added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jan 28, 2018
@codecov-io
Copy link

codecov-io commented Jan 28, 2018

Codecov Report

Merging #3421 into master will increase coverage by 0.02%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3421      +/-   ##
==========================================
+ Coverage   35.58%   35.61%   +0.02%     
==========================================
  Files         281      281              
  Lines       40593    40591       -2     
==========================================
+ Hits        14445    14455      +10     
+ Misses      24008    23998      -10     
+ Partials     2140     2138       -2
Impacted Files Coverage Δ
models/pull.go 52.16% <100%> (+0.12%) ⬆️
models/repo_list.go 65.62% <0%> (-1.57%) ⬇️
models/repo.go 42.98% <0%> (-0.19%) ⬇️
models/repo_indexer.go 46.01% <0%> (+3.98%) ⬆️
modules/process/manager.go 81.15% <0%> (+4.34%) ⬆️
modules/indexer/indexer.go 77.5% <0%> (+7.5%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 28b8189...36d08b6. Read the comment docs.

@tboerger tboerger added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jan 29, 2018
@lafriks lafriks merged commit 46c7fe3 into go-gitea:master Jan 29, 2018
@ethantkoenig ethantkoenig deleted the fix/merge_pr branch February 21, 2018 05:53
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants