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

Check if diff actually contains sections when rendering #9926

Merged
merged 3 commits into from
Jan 22, 2020

Conversation

lafriks
Copy link
Member

@lafriks lafriks commented Jan 21, 2020

Fixes #9807

@lafriks lafriks added this to the 1.12.0 milestone Jan 21, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jan 21, 2020
@techknowlogick
Copy link
Member

should this be backport to 1.11?

@lafriks
Copy link
Member Author

lafriks commented Jan 21, 2020

yes, v1.11 also have this bug just like v1.10 but I don't know if it is needed to backport it

@GiteaBot GiteaBot 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 21, 2020
@silverwind
Copy link
Member

I think it was regressed in 149a9df which does not seem present on v1.10.

@codecov-io
Copy link

codecov-io commented Jan 22, 2020

Codecov Report

Merging #9926 into master will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #9926      +/-   ##
==========================================
- Coverage   42.28%   42.27%   -0.02%     
==========================================
  Files         608      608              
  Lines       79392    79392              
==========================================
- Hits        33573    33562      -11     
- Misses      41679    41688       +9     
- Partials     4140     4142       +2
Impacted Files Coverage Δ
modules/git/utils.go 65.67% <0%> (-4.48%) ⬇️
modules/process/manager.go 74.69% <0%> (-3.62%) ⬇️
modules/convert/pull.go 66.95% <0%> (-3.48%) ⬇️
modules/repository/branch.go 52.1% <0%> (-2.53%) ⬇️
modules/git/repo.go 44.49% <0%> (-0.92%) ⬇️
routers/repo/view.go 38.59% <0%> (-0.88%) ⬇️
services/pull/check.go 56.64% <0%> (ø) ⬆️
models/error.go 31.31% <0%> (+0.54%) ⬆️
services/pull/pull.go 36.12% <0%> (+1.14%) ⬆️
services/pull/patch.go 66.03% <0%> (+1.25%) ⬆️

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 6d18db6...1b9312c. Read the comment docs.

@lunny
Copy link
Member

lunny commented Jan 22, 2020

@lafriks please rebase.

@lafriks lafriks merged commit 3185a13 into go-gitea:master Jan 22, 2020
@lafriks lafriks deleted the fix/diff_file_mode branch January 22, 2020 07:21
lafriks added a commit to lafriks-fork/gitea that referenced this pull request Jan 22, 2020
@lafriks lafriks added the backport/done All backports for this PR have been created label Jan 22, 2020
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created 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.

compare: index out of range panic on master and v1.11
7 participants