]> source.dussan.org Git - gitea.git/commitdiff
fix orphan check for deleted branch (#27310) (#27320)
authorGiteabot <teabot@gitea.io>
Thu, 28 Sep 2023 03:16:05 +0000 (11:16 +0800)
committerGitHub <noreply@github.com>
Thu, 28 Sep 2023 03:16:05 +0000 (11:16 +0800)
Backport #27310 by @earl-warren

- Modify the deleted branch orphan check to check for the new table
instead.
- Regression from 6e19484f4d3bf372212f2da462110a1a8c10cbf2
- Resolves https://codeberg.org/forgejo/forgejo/issues/1522

(cherry picked from commit c1d888686fe445e4edecb9d835c5b3893b574b75)

Co-authored-by: Earl Warren <109468362+earl-warren@users.noreply.github.com>
Co-authored-by: Gusted <postmaster@gusted.xyz>
modules/doctor/dbconsistency.go

index 548687355605b97b6efb09453371ed8e3efb7b14..a0637b8982cf30f56f2610c277554d5c51666dcf 100644 (file)
@@ -168,9 +168,9 @@ func checkDBConsistency(ctx context.Context, logger log.Logger, autofix bool) er
                // find protected branches without existing repository
                genericOrphanCheck("Protected Branches without existing repository",
                        "protected_branch", "repository", "protected_branch.repo_id=repository.id"),
-               // find deleted branches without existing repository
-               genericOrphanCheck("Deleted Branches without existing repository",
-                       "deleted_branch", "repository", "deleted_branch.repo_id=repository.id"),
+               // find branches without existing repository
+               genericOrphanCheck("Branches without existing repository",
+                       "branch", "repository", "branch.repo_id=repository.id"),
                // find LFS locks without existing repository
                genericOrphanCheck("LFS locks without existing repository",
                        "lfs_lock", "repository", "lfs_lock.repo_id=repository.id"),