mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-17 16:42:19 +09:00
95d6b572fe
Backport #39807 by @gomitrah With "Autodetect manual merge" enabled, an empty pull request (one with no commits of its own, for example opened to discuss a branch) was closed as manually merged as soon as it was checked. Its head commit is already an ancestor of the base branch, so the detection took the "fast-forwarded" path and recorded the head itself as the merge commit, even though nothing was merged. Detection now skips a PR whose head commit is its merge base, the same condition Gitea already uses to show a PR as "already included in the target branch". Real manual merges are still detected, including when the base branch and the PR branch are pushed together. The merge base is refreshed on recheck, so a fast-forward manual merge whose merge base was already refreshed to the head is not detected either. This only misses a detection and never closes a PR wrongly; telling the two apart would need a value stored at PR creation. Fixes https://github.com/go-gitea/gitea/issues/31947 Co-authored-by: Mitrahsoft <bala.c@mitrahsoft.in> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>