Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork6.3k
Fix push commits comments when changing the pull request target branch#35386
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
silverwind approved these changesSep 8, 2025
hiifong approved these changesSep 9, 2025
b9efbe9 intogo-gitea:main 26 checks passed
Uh oh!
There was an error while loading.Please reload this page.
Collaborator
GiteaBot commentedSep 9, 2025
I was unable to create a backport for 1.24.@lunny, please send one manually. 🍵 |
lunny added a commit to lunny/gitea that referenced this pull requestSep 9, 2025
go-gitea#35386)When changing the pull request target branch, the pushed commitscomments will not be changed resulted the number are inconsistentbetween commits tab number and the pushed commits comments number.This PR will remove all the previous pushed commits comments andcalculate new comments when changing the target branch.Before:<img width="928" height="585" alt="image"src="https://github.com/user-attachments/assets/35e4d31f-31a1-4d14-83b0-1786721ab0d9"/>After:<img width="816" height="623" alt="image"src="https://github.com/user-attachments/assets/24b6dafe-9238-4e7e-833d-68472457afab"/>
silverwind pushed a commit that referenced this pull requestSep 10, 2025
#35386) (#35443)Backport#35386 When changing the pull request target branch, the pushed commitscomments will not be changed resulted the number are inconsistentbetween commits tab number and the pushed commits comments number.This PR will remove all the previous pushed commits comments andcalculate new comments when changing the target branch.Before:<img width="928" height="585" alt="image"src="https://github.com/user-attachments/assets/35e4d31f-31a1-4d14-83b0-1786721ab0d9"/>After:<img width="816" height="623" alt="image"src="https://github.com/user-attachments/assets/24b6dafe-9238-4e7e-833d-68472457afab"/>
zjjhot added a commit to zjjhot/gitea that referenced this pull requestSep 10, 2025
* giteaofficial/main: Fix a compare page 404 bug when the pull request disabled (go-gitea#35441) Use db.WithTx/WithTx2 instead of TxContext when possible (go-gitea#35428) [skip ci] Updated translations via Crowdin Update JS and PY dependencies (go-gitea#35444) check user and repo for redirects when using git via SSH transport (go-gitea#35416) Fix push commits comments when changing the pull request target branch (go-gitea#35386) Fix bug when issue disabled, pull request number in the commit message cannot be redirected (go-gitea#35420) [skip ci] Updated translations via Crowdin Update gofumpt, add go.mod ignore directive (go-gitea#35434)
Sign up for freeto subscribe to this conversation on GitHub. Already have an account?Sign in.
Labels
backport/doneAll backports for this PR have been created backport/manualNo power to the bots! Create your backport yourself! backport/v1.24This PR should be backported to Gitea 1.24 lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore. modifies/goPull requests that update Go code type/bug
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When changing the pull request target branch, the pushed commits comments will not be changed resulted the number are inconsistent between commits tab number and the pushed commits comments number.
This PR will remove all the previous pushed commits comments and calculate new comments when changing the target branch.
Before:
After:
