Skip to content
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

Merge two functions with the same content #32805

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Merge two functions with the same content #32805

wants to merge 7 commits into from
+39 −30

Conversation

lunny
Copy link
Member

@lunny lunny commented Dec 12, 2024

Extract from #32786

@lunny lunny added the type/refactoring Existing code has been cleaned up. There should be no new functionality. label Dec 12, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 12, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 12, 2024
@github-actions github-actions bot added modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code labels Dec 12, 2024
Zettat123
Zettat123 reviewed Dec 12, 2024
View reviewed changes
models/repo/fork.go Outdated Show resolved Hide resolved
wxiaoguang
wxiaoguang reviewed Dec 12, 2024
View reviewed changes
routers/web/repo/fork.go
Comment on lines +170 to +173
if err != nil && !repo_model.IsErrRepoNotExist(err) {
ctx.ServerError("GetForkedRepo", err)
return
}
Copy link
Contributor

Choose a reason for hiding this comment

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

The "merge" made code more complex than it should be.

I really dislike (hate) so many "if err { ServerError; return }" in code.

Copy link
Member Author

Choose a reason for hiding this comment

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

Do you have any better idea? Just skip the error when getting a fork like before.

Copy link
Contributor

Choose a reason for hiding this comment

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

Leave to 1.24?

@lunny lunny added this to the 1.24.0 milestone Dec 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@a1012112796 a1012112796 a1012112796 left review comments

@Zettat123 Zettat123 Zettat123 left review comments

@wxiaoguang wxiaoguang wxiaoguang left review comments

Assignees
No one assigned
Labels
lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Milestone
1.24.0
Development

Successfully merging this pull request may close these issues.
5 participants
@lunny @wxiaoguang @Zettat123 @a1012112796 @GiteaBot