mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-05-13 22:40:24 +00:00
8154ea5bea
Fixes https://codeberg.org/forgejo/forgejo/issues/6163 Fixes https://codeberg.org/forgejo/forgejo/issues/3343 The merge base doctor check & fix was broken and could introduce irreversible "fixes" to wrong merge bases for PRs using the `fast-forward` and `rebase-and-merge` strategies. The mergebase fix was originally introduced in a migration [0] to fix an existing issue [1] in the merge code in 2020. Later added as a doctor command without explanation [2]. We decided to remove this check, as there is no apparent reason for it to still be necessary or any PR merge base state being out of sync with the current implementation. It does more harm to keep the code in and there is no way to fix `fast-forward` and `rebase-and-merge` PRs, due to their merge implementation. `fast-forward`: The git state inherently cannot reconstruct a merge base in this scenario by design. `rebase-and-merge`: Is rebased on a temporary repository clone and thus might receive a different merge base, depending on how far the target branch is ahead. [0]: |
||
|---|---|---|
| .. | ||
| actions.go | ||
| authorizedkeys.go | ||
| breaking.go | ||
| checkOldArchives.go | ||
| dbconsistency.go | ||
| dbversion.go | ||
| doctor.go | ||
| fix8312.go | ||
| fix16961.go | ||
| fix16961_test.go | ||
| heads.go | ||
| lfs.go | ||
| misc.go | ||
| packages_nuget.go | ||
| paths.go | ||
| push_mirror_consistency.go | ||
| repository.go | ||
| storage.go | ||
| usertype.go | ||