Add rebase push display wrong comments bug by lunny · Pull Request #35560 · go-gitea/gitea

lunny · 2025-10-01T06:40:28Z

silverwind · 2025-10-01T16:58:34Z

Will this erase commits that were force-pushed over from the history? This is a very old bug that I noticed once, and I would appreciate if these commits were erased from history, just like on GitHub.

lunny · 2025-10-01T23:16:02Z

Will this erase commits that were force-pushed over from the history? This is a very old bug that I noticed once, and I would appreciate if these commits were erased from history, just like on GitHub.

This will fix a bug caused by my previous PR which forgot set IsForceBranch as true. That means this will restore the features before my previous PR and the old push comments will not be deleted.

Are you sure Github will delete the old push comments?
P.S. Changing target branch will delete all the old push comments.

silverwind · 2025-10-02T04:35:06Z

Yes they do. Say for example I push up commits 1,2,3 to a PR and I git rebase -i origin/master and squash commits 2 and 3 and force-push that, they will be erased from the commit history on GitHub, but not in Gitea. Example PR.

Before:

After:

routers/web/repo/pull.go

wxiaoguang · 2025-10-02T04:55:32Z

tests/integration/pull_comment_test.go

+		err = os.WriteFile(dstPath+"/README.md", []byte("Hello, World (Edited Conflict Resolved)\n"), 0o644)
+		assert.NoError(t, err)
+		_, _, err = gitcmd.NewCommand().AddArguments("add", "--all").RunStdString(t.Context(), &gitcmd.RunOpts{Dir: dstPath})
+		assert.NoError(t, err)
+		doGitCommit(dstPath, "Resolve conflict")(t)


There is already doGitAddSomeCommits?

That function can not be used here because we need to make a conflict line.

I do not see why it should duplicate the code by copy&paste

2bea40d

tests/integration/pull_comment_test.go

Fix go-gitea#35518 --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

@lunny

Backport #35560 by @lunny Fix #35518 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

Fix go-gitea#35518 --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

* giteaofficial/main: fix: auto-expand and auto-scroll for actions logs (go-gitea#35570) (go-gitea#35583) [skip ci] Updated translations via Crowdin [skip ci] Updated translations via Crowdin Fix creating pull request failure when the target branch name is the same as some tag (go-gitea#35552) Use bundled version of spectral (go-gitea#35573) Add rebase push display wrong comments bug (go-gitea#35560) Address some CodeQL security concerns (go-gitea#35572) fix(webhook): prevent tag events from bypassing branch filters targets go-gitea#35449 (go-gitea#35567) Added button to copy file name in PR files (go-gitea#35509) Update JS and PY deps (go-gitea#35565) Enable a few more tsconfig options (go-gitea#35553) Bump github.com/wneessen/go-mail from 0.6.2 to 0.7.1 (go-gitea#35557) add more routes to the "expensive" list (go-gitea#35547) Drop json-iterator dependency (go-gitea#35544) Add proper error message if session provider can not be created (go-gitea#35520) use experimental go json v2 library (go-gitea#35392) Use global lock instead of status pool for cron lock (go-gitea#35507) Move some functions to gitrepo package (go-gitea#35503) Move GetDiverging functions to gitrepo (go-gitea#35524) [skip ci] Updated translations via Crowdin

badhezi · 2025-10-08T12:18:56Z

@lunny
I think the TestPullComment test might be flaky, I had it fail and pass on the same code (without changes related to it)
Failed: https://github.com/go-gitea/gitea/actions/runs/18338982161/job/52229590592
Passed: https://github.com/go-gitea/gitea/actions/runs/18343618920/job/52244747162

Appears to be from nil pointer on:
testPullCommentRebase > LoadCommentPushCommits > RepositoryFromContextOrOpen

gitea/services/issue/comments.go

Line 174 in 03fce8f

gitRepo, closer, err := gitrepo.RepositoryFromContextOrOpen(ctx, c.Issue.Repo)

lunny · 2025-10-14T02:58:25Z

@lunny I think the TestPullComment test might be flaky, I had it fail and pass on the same code (without changes related to it) Failed: https://github.com/go-gitea/gitea/actions/runs/18338982161/job/52229590592 Passed: https://github.com/go-gitea/gitea/actions/runs/18343618920/job/52244747162

Appears to be from nil pointer on: testPullCommentRebase > LoadCommentPushCommits > RepositoryFromContextOrOpen

gitea/services/issue/comments.go

Line 174 in 03fce8f

gitRepo, closer, err := gitrepo.RepositoryFromContextOrOpen(ctx, c.Issue.Repo)

I have sent #35647 to try to fix it.

GiteaBot · 2025-10-14T18:28:37Z

I was unable to create a backport for 1.24. @lunny, please send one manually. 🍵

go run ./contrib/backport 35560
...  // fix git conflicts if any
go run ./contrib/backport --continue

Add tests

23ed657

lunny added type/bug backport/v1.24 This PR should be backported to Gitea 1.24 backport/v1.25 labels Oct 1, 2025

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 1, 2025

github-actions bot added the modifies/go Pull requests that update Go code label Oct 1, 2025

lunny changed the title ~~Add rebase push comment missing bug~~ Add rebase push display wrong comments bug Oct 1, 2025

lunny added 2 commits October 1, 2025 09:37

Fix test

343ca9c

Merge branch 'main' into lunny/fix_rebase_bug

5d23bc1

silverwind approved these changes Oct 2, 2025

View reviewed changes

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 Oct 2, 2025

wxiaoguang reviewed Oct 2, 2025

View reviewed changes

routers/web/repo/pull.go Outdated Show resolved Hide resolved

wxiaoguang reviewed Oct 2, 2025

View reviewed changes

tests/integration/pull_comment_test.go Outdated Show resolved Hide resolved

wxiaoguang reviewed Oct 2, 2025

View reviewed changes

tests/integration/pull_comment_test.go Outdated Show resolved Hide resolved

wxiaoguang and others added 8 commits October 2, 2025 14:02

fix doGitCommit

2bea40d

use require for errors

28f091d

fix

c5c1d5b

fix comment

30d77cd

return json

9b148f2

Merge branch 'main' into lunny/fix_rebase_bug

07998cb

Merge branch 'main' into lunny/fix_rebase_bug

abf215f

Merge branch 'main' into lunny/fix_rebase_bug

b399cdc

hiifong approved these changes Oct 3, 2025

View reviewed changes

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 Oct 3, 2025

lunny merged commit 17c8aa6 into go-gitea:main Oct 3, 2025
26 checks passed

GiteaBot added this to the 1.26.0 milestone Oct 3, 2025

lunny deleted the lunny/fix_rebase_bug branch October 3, 2025 22:16

GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Oct 3, 2025

Add rebase push display wrong comments bug (go-gitea#35560)

1800482

Fix go-gitea#35518 --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

GiteaBot mentioned this pull request Oct 3, 2025

Add rebase push display wrong comments bug (#35560) #35580

Merged

silverwind pushed a commit that referenced this pull request Oct 4, 2025

Add rebase push display wrong comments bug (#35560) (#35580)

006fe2a

Backport #35560 by @lunny Fix #35518 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

rossigee pushed a commit to rossigee/gitea that referenced this pull request Oct 4, 2025

Add rebase push display wrong comments bug (go-gitea#35560)

032ea62

Fix go-gitea#35518 --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

rossigee pushed a commit to rossigee/gitea that referenced this pull request Oct 4, 2025

Add rebase push display wrong comments bug (go-gitea#35560)

0d7d00a

Fix go-gitea#35518 --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

wxiaoguang mentioned this pull request Oct 9, 2025

Use merge tree to improve conflict checking performance when possible #35542

Closed

lunny mentioned this pull request Oct 14, 2025

Backport/v1.24 will not trigger any backport PR when labelled with backport/v1.25 GiteaBot/gitea-backporter#143

Closed

GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Oct 14, 2025

lunny added backport/done All backports for this PR have been created and removed backport/v1.24 This PR should be backported to Gitea 1.24 labels Oct 14, 2025

xnox mentioned this pull request Dec 7, 2025

release/v1.25 #36102

Closed

go-gitea locked as resolved and limited conversation to collaborators Jan 2, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Comments

Add rebase push display wrong comments bug#35560

Add rebase push display wrong comments bug#35560
lunny merged 11 commits intogo-gitea:mainfrom
lunny:lunny/fix_rebase_bug

lunny commented Oct 1, 2025

Uh oh!

silverwind commented Oct 1, 2025

Uh oh!

lunny commented Oct 1, 2025

Uh oh!

silverwind commented Oct 2, 2025 •

edited

Loading

Uh oh!

Uh oh!

wxiaoguang Oct 2, 2025

Uh oh!

lunny Oct 2, 2025 •

edited

Loading

Uh oh!

wxiaoguang Oct 2, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

badhezi commented Oct 8, 2025

Uh oh!

lunny commented Oct 14, 2025

Uh oh!

GiteaBot commented Oct 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Comments

Conversation

lunny commented Oct 1, 2025

Uh oh!

silverwind commented Oct 1, 2025

Uh oh!

lunny commented Oct 1, 2025

Uh oh!

silverwind commented Oct 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

wxiaoguang Oct 2, 2025

Choose a reason for hiding this comment

Uh oh!

lunny Oct 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wxiaoguang Oct 2, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

badhezi commented Oct 8, 2025

Uh oh!

lunny commented Oct 14, 2025

Uh oh!

GiteaBot commented Oct 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

silverwind commented Oct 2, 2025 •

edited

Loading

lunny Oct 2, 2025 •

edited

Loading