Movatterモバイル変換

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

github-actionsbot added the modifies/goPull requests that update Go code label

lunny changed the title~~Add rebase push comment missing bug~~Add rebase push display wrong comments bug

lunny added2 commits

October 1, 2025 09:37

Fix test

343ca9c

Merge branch 'main' into lunny/fix_rebase_bug

5d23bc1

Copy link

Member

silverwind commentedOct 1, 2025

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.

Copy link

MemberAuthor

lunny commentedOct 1, 2025

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.

Copy link

Member

silverwind commentedOct 2, 2025•
edited
Loading

Yes they do. Say for example I push up commits 1,2,3 to a PR and Igit 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:

silverwind approved these changes

GiteaBot added lgtm/need 1This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2This PR needs two approvals by maintainers to be considered for merging. labels

wxiaoguang reviewed

routers/web/repo/pull.go OutdatedShow resolvedHide resolved

wxiaoguang reviewed

tests/integration/pull_comment_test.go Outdated

Comment on lines 49 to 53

		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)

Copy link

Contributor

wxiaoguangOct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

There is alreadydoGitAddSomeCommits?

Copy link

MemberAuthor

lunnyOct 2, 2025•
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

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

Copy link

Contributor

wxiaoguangOct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

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

2bea40d

wxiaoguang reviewed

tests/integration/pull_comment_test.go OutdatedShow resolvedHide resolved

wxiaoguang reviewed

tests/integration/pull_comment_test.go OutdatedShow resolvedHide resolved

wxiaoguangand others added8 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

GiteaBot added lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1This PR needs approval from one additional maintainer to be merged. labels

lunny merged commit17c8aa6 intogo-gitea:main

26 checks passed

GiteaBot added this to the1.26.0 milestone

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

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

1800482

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

GiteaBot mentioned this pull request