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

Prevent lfs process filter from running #7062

Closed

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented May 27, 2019

This PR sets the lfs process filter to empty preventing them from running during merge.

Fixes #732

@codecov-io
Copy link

Codecov Report

Merging #7062 into master will decrease coverage by 0.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #7062      +/-   ##
==========================================
- Coverage   41.46%   41.44%   -0.02%     
==========================================
  Files         442      442              
  Lines       59611    59623      +12     
==========================================
- Hits        24715    24711       -4     
- Misses      31665    31679      +14     
- Partials     3231     3233       +2
Impacted Files Coverage Δ
models/pull.go 49.15% <0%> (-0.57%) ⬇️
models/unit.go 62.16% <0%> (-5.41%) ⬇️
models/repo_list.go 72.08% <0%> (-1.02%) ⬇️
routers/repo/view.go 42.02% <0%> (-1.02%) ⬇️
modules/log/file.go 77.62% <0%> (+2.09%) ⬆️
modules/log/colors_router.go 87.5% <0%> (+4.16%) ⬆️

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 9ca7fcd...a6e0e73. Read the comment docs.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 27, 2019
@zeripath
Copy link
Contributor Author

zeripath commented May 28, 2019

Hmm... I think this might not be the correct solution. We need to tell the LFS that the merged files are now being referenced in the merged into repository - and without these filters running, at least in some way, this won't necessarily happen.

So although there might be another bug with LFS due to us ignoring these filters, this PR will not be responsible for causing this and we should deal with that in another PR likely by making gitea a lfs filter itself.

@zeripath zeripath force-pushed the prevent-lfs-filters-on-merge-fix-#732 branch from a6e0e73 to 6508d0c Compare May 28, 2019 11:19
@zeripath zeripath changed the title Prevent lfs filters from running on merge Prevent lfs process filters from running May 28, 2019
@zeripath zeripath changed the title Prevent lfs process filters from running Prevent lfs process filter from running May 28, 2019
@zeripath
Copy link
Contributor Author

zeripath commented May 28, 2019

Therefore I believe this PR is ready for merging. nope spoke too soon

@zeripath
Copy link
Contributor Author

zeripath commented May 28, 2019

Damn! I'm going to have to rewrite the git tests because we actually want lfs to run normally for these - and we probably want LFS to run normally during migration.

Perhaps we just need to set the transport instead.

@zeripath
Copy link
Contributor Author

I'm going to close this whilst I rethink

@zeripath zeripath closed this May 28, 2019
@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
lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

LFS: Error 500 when merging pull request
3 participants