Fix codeowner detected diff base branch to mergebase #29783

lunny · 2024-03-14T03:18:03Z

Fix #29763

This PR fix 2 problems about CodeOwner in pull request.

Don't use pull request base branch but merge base as a diff base to detect the codeowner.
CodeOwner detection in fork repositories will be disabled because almost all the fork repositories will not change CODEOWNERS files but it should not be used on fork repositories' pull requests.

services/issue/pull.go

wxiaoguang

Overall LGTM, approve ahead

silverwind · 2024-03-14T10:51:01Z

Test failure related:

gitea/tests/integration/pull_review_test.go:36
        	Error:      	Received unexpected error:
        	            	initRepository: prepareRepoCommit: GetRepoInitFile[DEFAULT]: file does not exist
        	Test:       	TestPullView_CodeOwner
panic: runtime error: invalid memory address or nil pointer dereference [recovered]
	panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x0 pc=0x44b121b]

lunny · 2024-03-14T11:09:48Z

Test failure related:


gitea/tests/integration/pull_review_test.go:36

        	Error:      	Received unexpected error:

        	            	initRepository: prepareRepoCommit: GetRepoInitFile[DEFAULT]: file does not exist

        	Test:       	TestPullView_CodeOwner

panic: runtime error: invalid memory address or nil pointer dereference [recovered]

	panic: runtime error: invalid memory address or nil pointer dereference

[signal SIGSEGV: segmentation violation code=0x1 addr=0x0 pc=0x44b121b]

It's very wired. It run successfully local.

tests/integration/pull_review_test.go

Co-authored-by: wxiaoguang <[email protected]>

…ny/fix_codeowner

GiteaBot · 2024-03-15T05:13:19Z

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

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

Fix go-gitea#29763 This PR fixes 2 problems with CodeOwner in the pull request. - Don't use the pull request base branch but merge-base as a diff base to detect the code owner. - CodeOwner detection in fork repositories will be disabled because almost all the fork repositories will not change CODEOWNERS files but it should not be used on fork repositories' pull requests. --------- Co-authored-by: wxiaoguang <[email protected]>

Fix #29763 Backport #29783 This PR fixes 2 problems with CodeOwner in the pull request. - Don't use the pull request base branch but merge-base as a diff base to detect the code owner. - CodeOwner detection in fork repositories will be disabled because almost all the fork repositories will not change CODEOWNERS files but it should not be used on fork repositories' pull requests. --------- Co-authored-by: wxiaoguang <[email protected]>

…a forked repository (#30476) Fix #30277 Caused by #29783

…a forked repository (go-gitea#30476) Fix go-gitea#30277 Caused by go-gitea#29783

@lunny

…a forked repository (#30476) (#30496) Backport #30476 by @lunny Fix #30277 Caused by #29783 Co-authored-by: Lunny Xiao <[email protected]>

…a forked repository (#30476) (#30497) Backport #30476 Fix #30277 Caused by #29783

Fix codeowner detected diff base branch to mergebase

0d077ea

lunny added type/bug backport/v1.21 This PR should be backported to Gitea 1.21 labels Mar 14, 2024

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

pull-request-size bot added the size/L label Mar 14, 2024

github-actions bot added the modifies/go Pull requests that update Go code label Mar 14, 2024

lunny added 2 commits March 14, 2024 11:20

Merge branch 'main' into lunny/fix_codeowner

791b293

Fix lint

b95ad18

wxiaoguang reviewed Mar 14, 2024

View reviewed changes

services/issue/pull.go Outdated Show resolved Hide resolved

wxiaoguang reviewed Mar 14, 2024

View reviewed changes

services/issue/pull.go Outdated Show resolved Hide resolved

wxiaoguang approved these changes Mar 14, 2024

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 Mar 14, 2024

wolfogre approved these changes Mar 14, 2024

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 Mar 14, 2024

lunny added 4 commits March 14, 2024 15:29

Fix test

5425817

Merge branch 'main' into lunny/fix_codeowner

0f24bb2

Use a better remote name

d6b195e

Merge branch 'main' into lunny/fix_codeowner

e942eaf

wxiaoguang reviewed Mar 15, 2024

View reviewed changes

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

lunny and others added 4 commits March 15, 2024 11:16

Update tests/integration/pull_review_test.go

f15eae3

Co-authored-by: wxiaoguang <[email protected]>

Codeowner review should not be used on forked repositories

988c09a

Merge branch 'lunny/fix_codeowner' of github.com:lunny/gitea into lun…

12c91c1

…ny/fix_codeowner

Merge branch 'main' into lunny/fix_codeowner

31cdcac

lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 15, 2024

Merge branch 'main' into lunny/fix_codeowner

a478fbd

lunny enabled auto-merge (squash) March 15, 2024 05:04

lunny merged commit 277f90d into go-gitea:main Mar 15, 2024

GiteaBot added this to the 1.23.0 milestone Mar 15, 2024

GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Mar 15, 2024

lunny deleted the lunny/fix_codeowner branch March 15, 2024 06:16

lunny mentioned this pull request Mar 15, 2024

Fix codeowner detected diff base branch to mergebase (#29783) #29807

Merged

lunny added the backport/done All backports for this PR have been created label Mar 15, 2024

6543 modified the milestones: 1.23.0, 1.22.0 Mar 16, 2024

lunny mentioned this pull request Mar 27, 2024

Codeowner change detection doesn't work for outdated branches #28135

Closed

This was referenced Apr 14, 2024

Gitea does not apply CODEOWNERS for PRs from forks #30277

Closed

Fix code owners will not be mentioned when a pull request comes from a forked repository #30476

Merged

silverwind pushed a commit that referenced this pull request Apr 15, 2024

Fix code owners will not be mentioned when a pull request comes from …

c63060b

…a forked repository (#30476) Fix #30277 Caused by #29783

GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Apr 15, 2024

Fix code owners will not be mentioned when a pull request comes from …

e29d1ec

…a forked repository (go-gitea#30476) Fix go-gitea#30277 Caused by go-gitea#29783

GiteaBot mentioned this pull request Apr 15, 2024

Fix code owners will not be mentioned when a pull request comes from a forked repository (#30476) #30496

Merged

lunny added a commit to lunny/gitea that referenced this pull request Apr 15, 2024

Fix code owners will not be mentioned when a pull request comes from …

da35d93

…a forked repository (go-gitea#30476) Fix go-gitea#30277 Caused by go-gitea#29783

lunny mentioned this pull request Apr 15, 2024

Fix code owners will not be mentioned when a pull request comes from a forked repository (#30476) #30497

Merged

lunny added a commit that referenced this pull request Apr 16, 2024

Fix code owners will not be mentioned when a pull request comes from …

60181eb

…a forked repository (#30476) (#30497) Backport #30476 Fix #30277 Caused by #29783

go-gitea locked as resolved and limited conversation to collaborators Jun 13, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix codeowner detected diff base branch to mergebase #29783

Fix codeowner detected diff base branch to mergebase #29783

lunny commented Mar 14, 2024 •

edited

Loading

wxiaoguang left a comment

silverwind commented Mar 14, 2024

lunny commented Mar 14, 2024

GiteaBot commented Mar 15, 2024

Fix codeowner detected diff base branch to mergebase #29783

Fix codeowner detected diff base branch to mergebase #29783

Conversation

lunny commented Mar 14, 2024 • edited Loading

wxiaoguang left a comment

Choose a reason for hiding this comment

silverwind commented Mar 14, 2024

lunny commented Mar 14, 2024

GiteaBot commented Mar 15, 2024

lunny commented Mar 14, 2024 •

edited

Loading