Skip to content

Fix checks in PR for empty commits (#20290) #20352

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 9 commits into from
Jul 13, 2022
Merged

Fix checks in PR for empty commits (#20290) #20352

merged 9 commits into from
Jul 13, 2022

Conversation

@jedi7
Copy link
Contributor

@jedi7 jedi7 commented Jul 13, 2022 •
edited by wxiaoguang
Loading

backport of PR #20290

jedi7 and others added 7 commits July 13, 2022 11:06
@jedi7
Use gitRepo.GetRefCommitID to be consistent
68c4d7e
@jedi7
Fix checks in PR for empty commits go-gitea#19603
4a5451e 
* Fixes issue go-gitea#19603
* fill HeadCommitID in PullRequest
* compare real commits ID as check for merging
* basd on zeripath patch
@zeripath @jedi7
shortcut when mergebase is the head commit
16f6ccd 
Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath @jedi7
Add StatusAncestor
9e48ff9 
Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath @jedi7
Update services/pull/check.go
16fc8de
@jedi7
fix test for same commit
e55a34b
@jedi7
Update web_src/js/components/PullRequestMergeForm.vue
f3cae88 
Co-authored-by: Gusted <williamzijl7@hotmail.com>
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jul 13, 2022
@6543 6543 changed the title Backport 20290 1.17 Fix checks in PR for empty commits (#20290) Jul 13, 2022
@6543 6543 added the type/bug label Jul 13, 2022
@6543 6543 added this to the 1.17.0 milestone Jul 13, 2022
@6543
Copy link
Member

6543 commented Jul 13, 2022

@jedi7 tests fail

wxiaoguang
wxiaoguang reviewed Jul 13, 2022
View reviewed changes
wxiaoguang
wxiaoguang reviewed Jul 13, 2022
View reviewed changes
@wxiaoguang wxiaoguang linked an issue Jul 13, 2022 that may be closed by this pull request
Not able to merge commit in PR when branches content is same, but different commit id #19603
Closed
@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 13, 2022
@zeripath zeripath merged commit 92a43d5 into go-gitea:release/v1.17 Jul 13, 2022
@jedi7
Copy link
Contributor Author

jedi7 commented Jul 13, 2022

@wxiaoguang thank you for fixes :)

@wxiaoguang wxiaoguang mentioned this pull request Jul 14, 2022
Closed
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@wxiaoguang wxiaoguang wxiaoguang left review comments

@6543 6543 6543 approved these changes

+1 more reviewer

@a1012112796 a1012112796 a1012112796 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug

Projects

None yet

Milestone

1.17.0

Development

Successfully merging this pull request may close these issues.

Not able to merge commit in PR when branches content is same, but different commit id

6 participants

@jedi7 @6543 @wxiaoguang @a1012112796 @zeripath @GiteaBot