Skip to content

Do not overwrite empty DefaultBranch #22708

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

Merged
merged 5 commits into from
Feb 2, 2023
Merged

Do not overwrite empty DefaultBranch #22708

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de54680
fix: don't overwrite empty DefaultBranch
wolfogre Feb 1, 2023
aec2b43
Merge branch 'main' into bugfix/no_overwrite_empty_default_branch
wolfogre Feb 1, 2023
e3796de
test: set default_branch if repo isn't empty
wolfogre Feb 1, 2023
0be49a9
Merge branch 'main' into bugfix/no_overwrite_empty_default_branch
wolfogre Feb 1, 2023
843a021
Merge branch 'main' into bugfix/no_overwrite_empty_default_branch
jolheiser Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions models/repo/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,11 +227,6 @@ func (repo *Repository) IsBroken() bool {

// AfterLoad is invoked from XORM after setting the values of all fields of this object.
func (repo *Repository) AfterLoad() {
// FIXME: use models migration to solve all at once.
if len(repo.DefaultBranch) == 0 {
repo.DefaultBranch = setting.Repository.DefaultBranch
}

repo.NumOpenIssues = repo.NumIssues - repo.NumClosedIssues
repo.NumOpenPulls = repo.NumPulls - repo.NumClosedPulls
repo.NumOpenMilestones = repo.NumMilestones - repo.NumClosedMilestones
Expand Down