Skip to content

Don't use full-file highlight when there is a git diff textconv #35114

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Jul 18, 2025
Merged

Don't use full-file highlight when there is a git diff textconv #35114

merged 2 commits into from
Jul 18, 2025

Conversation

wxiaoguang
Copy link
Contributor

Fix #35106

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 18, 2025
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Jul 18, 2025
@wxiaoguang wxiaoguang mentioned this pull request Jul 18, 2025
Closed
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 18, 2025
@silverwind
Copy link
Member

How hard is it to add a test?

@silverwind silverwind added the backport/v1.24 This PR should be backported to Gitea 1.24 label Jul 18, 2025
@wxiaoguang
Copy link
Contributor Author

How hard is it to add a test?

Very hard, see the issue's steps ... so I think I don't have enough time to propose a test for it at the moment .......

Maybe in the future we can split the large function into small ones and test the small ones with some mock data (but this PR is small enough to backport)

@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 Jul 18, 2025
@silverwind
Copy link
Member

Yeah, should always extract testable functions, not have big untestable messes.

@wxiaoguang wxiaoguang merged commit c4f5b2b into go-gitea:main Jul 18, 2025
26 checks passed
@GiteaBot GiteaBot added this to the 1.25.0 milestone Jul 18, 2025
@wxiaoguang wxiaoguang deleted the fix-git-diff branch July 18, 2025 11:16
wxiaoguang added a commit to wxiaoguang/gitea that referenced this pull request Jul 18, 2025
@wxiaoguang
Don't use full-file highlight when there is a git diff textconv (go-g…
580f2d1 
…itea#35114)

Fix go-gitea#35106
@wxiaoguang wxiaoguang added backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! labels Jul 18, 2025
wxiaoguang added a commit that referenced this pull request Jul 18, 2025
@wxiaoguang
Don't use full-file highlight when there is a git diff textconv (#35114…
9959604 
…) (#35119)

Fix #35106
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jul 22, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
d14ed18 
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Fix session gob (go-gitea#35128)
  Replace `setup-python` with `setup-uv` (go-gitea#35116)
  Don't use full-file highlight when there is a git diff textconv (go-gitea#35114)
  Fix submodule parsing when the gitmodules is missing (go-gitea#35109)
  Align `issue-title-buttons` with `list-header` (go-gitea#35018)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@silverwind silverwind silverwind approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.24 This PR should be backported to Gitea 1.24 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code
Projects
None yet
Milestone
1.25.0
Development

Successfully merging this pull request may close these issues.

Broken textconf for git diff
4 participants
@wxiaoguang @silverwind @delvh @GiteaBot