forked from NYANDEV/forgejo
439fadf563
services: in loadOneBranch, return if CountDivergingCommits fail If we can't count the number of diverging commits for one reason or another (such as the branch being in the database, but missing from disk), rather than logging an error and continuing into a crash (because `divergence` will be nil), return an error instead. Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu> (cherry picked from commit 8266105f24eb76b1dfb4c79d9bfde2ef9a98417a) services: Gracefully handle missing branches When loading branches, if loading one fails, log an error, and ignore the branch, rather than returning and causing an internal server error. Ideally, we would only ignore the error if it was caused by a missing branch, and do it silently, like the respective API endpoint does. However, veryfing that at this place is not very practical, so for the time being, ignore any and all branch loading errors. Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu> (cherry picked from commit e552a8fd629b11503569f605c824c1c0b01eeab2) tests: Add a testcase for missing branches This tests the scenario reported in Codeberg/Community#1408: a branch that is recorded in the database, but missing on disk was causing internal server errors. With recent changes, that is no longer the case, the error is logged and then ignored. This test case tests this behaviour, that the repo's branches page on the web UI functions even if the git branch is missing. Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu> (cherry picked from commit e20eb7b3853e25ab29d4ca63b015517b44e4954f) tests: More testing in TestDatabaseMissingABranch In the `TestDatabaseMissingABranch` testcase, make sure that the branches are in sync between the db and git before deleting a branch via git, then compare the branch count from the web UI, making sure that it returns an out-of-sync value first, and the correct one after another sync. This is currently tested by scraping the UI, and relies on the fact that the branch counter is out of date before syncing. If that issue gets resolved, we'll have to adjust the test to verify the sync another way. Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu> (cherry picked from commit 8c2ccfcecec6182dd80d463f58223acbf16b039b) |
||
|---|---|---|
| .. | ||
| archiver | ||
| files | ||
| adopt.go | ||
| adopt_test.go | ||
| avatar.go | ||
| avatar_test.go | ||
| branch.go | ||
| cache.go | ||
| check.go | ||
| collaboration.go | ||
| collaboration_test.go | ||
| commit.go | ||
| create.go | ||
| create_test.go | ||
| delete.go | ||
| delete_test.go | ||
| fork.go | ||
| fork_test.go | ||
| hooks.go | ||
| lfs.go | ||
| lfs_test.go | ||
| main_test.go | ||
| push.go | ||
| repository.go | ||
| repository_test.go | ||
| review.go | ||
| review_test.go | ||
| setting.go | ||
| template.go | ||
| transfer.go | ||
| transfer_test.go | ||