domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Sync repo's IsEmpty status correctly (#26517) (#26560)

Browse source 
Backport #26517 by @wxiaoguang

Close #26509

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 7da85fa0c3)
This commit is contained in:
Giteabot 2023-08-17 13:12:14 +08:00 • committed by Earl Warren
parent 44658b7d2c
commit 4ac522c8aa
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
services/repository/files/update.go
View file

@ -340,7 +340,9 @@ func ChangeRepoFiles(ctx context.Context, repo *repo_model.Repository, doer *use
}
if repo.IsEmpty {
_ = repo_model.UpdateRepositoryCols(ctx, &repo_model.Repository{ID: repo.ID, IsEmpty: false, DefaultBranch: opts.NewBranch}, "is_empty", "default_branch")
if isEmpty, err := gitRepo.IsEmpty(); err == nil && !isEmpty {
_ = repo_model.UpdateRepositoryCols(ctx, &repo_model.Repository{ID: repo.ID, IsEmpty: false, DefaultBranch: opts.NewBranch}, "is_empty", "default_branch")
}
}
return filesResponse, nil