4 people 6bc0e8cd57 fix(pull): recover PRs whose recorded merge commit never reached the base repo (#39831) (#39840) ...

Backport #39831 by @lunny

When pushing the merge commit to the base repo fails (e.g.
non-fast-forward), the merge intent recorded by
https://github.com/go-gitea/gitea/pull/39442 is left behind.
`merged_commit_id` then points to a commit that does not exist in the
base repo, and `git branch --contains` fails with `no such commit`, so
the PR can never be checked or merged again.

- Clear the recorded merge intent if the push fails and the commit is
not on the base branch
- `IsCommitInBranch` now returns false for a missing commit, so
already-stuck PRs recover on the next check

Fixes: https://github.com/go-gitea/gitea/issues/39824
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>

2026-10-18 03:24:11 -07:00

..

actions

fix(actions): fix schedule cleanup and default branch switch (#39740) (#39786)

2026-10-14 22:47:59 +00:00

agit

fix(pull): refresh commits behind when an AGit pull request is updated (#39613) (#39625)

2026-10-06 11:27:16 +00:00

asymkey

feat: Add audit logging (#38189)

2026-09-12 08:15:23 +00:00

attachment

chore: misc go 1.27 tweaks (#39069)

2026-08-24 18:26:10 +00:00

audit

feat: Add audit logging (#38189)

2026-09-12 08:15:23 +00:00

auth

fix(auth): prevent competing remember-me token rotations (#39686) (#39688)

2026-10-12 09:48:37 +00:00

automerge

fix: trace git command correctly (#39520) (#39524)

2026-10-01 10:19:33 +00:00

automergequeue

refactor(automerge): fix error handling, populate recent automerge tasks on restart (#39001)

2026-08-28 14:17:01 -07:00

context

fix: correct "go get" URL ssh scheme, fix form binding (#39674, #39528) (#39676)

2026-10-08 12:30:59 +00:00

contexttest

feat: add deploy tokens (#37306)

2026-08-26 19:32:44 +00:00

convert

fix(actions): restore pushes to protected branches (#39564) (#39567)

2026-10-03 18:12:17 +00:00

cron

feat: Add audit logging (#38189)

2026-09-12 08:15:23 +00:00

doctor

fix(lfs): validate OID before building filesystem object path (#39762) (#39766)

2026-10-13 17:19:59 -07:00

externalaccount

feat: Add audit logging (#38189)

2026-09-12 08:15:23 +00:00

feed

fix(feed): use meaningful lines as comment excerpt (#39276)

2026-09-25 03:08:15 +00:00

forms

fix: correct "go get" URL ssh scheme, fix form binding (#39674, #39528) (#39676)

2026-10-08 12:30:59 +00:00

git

enhance: inherit team access for all units (#38938)

2026-08-17 20:30:24 +00:00

gitdiff

fix(gitdiff): unquote C-quoted paths from git diff-tree --raw (#39781) (#39783)

2026-10-14 20:35:32 +00:00

gitproxy

fix(git)!: use internal proxy for all git operations (#39426)

2026-09-29 14:43:36 +02:00

indexer

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

issue

enhance: allow auto-closing PRs from PRs (#39393)

2026-09-25 11:35:13 +00:00

lfs

chore: fix system users (#39299)

2026-09-12 16:26:20 +00:00

mailer

refactor: "install" page (#39400)

2026-09-23 23:14:31 +00:00

markup

feat: add deploy tokens (#37306)

2026-08-26 19:32:44 +00:00

migrations

fix: add missing checks to several API and web handlers (#39501) (#39507)

2026-09-30 18:46:59 +00:00

mirror

fix(git)!: use internal proxy for all git operations (#39426)

2026-09-29 14:43:36 +02:00

notifications

feat: Replace SSE with WebSocket for UI notifications (#36965)

2026-07-27 07:46:00 +00:00

notify

fix: prevent Gitea from crashing by notification panic (#39835)

2026-10-18 11:11:15 +02:00

oauth2_provider

chore: enable forcetypeassert linter, fix issues (#38804)

2026-08-09 10:25:06 +00:00

org

feat: Add audit logging (#38189)

2026-09-12 08:15:23 +00:00

packages

fix: package registry keypair creation race (#39319)

2026-09-18 18:30:27 +00:00

projects

feat(api): add project APIs (#38691)

2026-08-08 13:53:28 +00:00

pubsub

chore: enable forcetypeassert linter, fix issues (#38804)

2026-08-09 10:25:06 +00:00

pull

fix(pull): recover PRs whose recorded merge commit never reached the base repo (#39831) (#39840)

2026-10-18 03:24:11 -07:00

release

fix: correct label deletion and release attachment load (#39743) (#39752)

2026-10-13 00:53:02 +00:00

repository

fix(actions): fix schedule cleanup and default branch switch (#39740) (#39786)

2026-10-14 22:47:59 +00:00

secrets

feat: Add audit logging (#38189)

2026-09-12 08:15:23 +00:00

task

fix: classify git failures on stderr, restrict migration failure detail (#39010)

2026-09-15 10:59:34 +02:00

uinotification

feat: add watch options (#37571)

2026-08-08 07:35:13 +00:00

user

fix(user): allow unblocking users promoted to admin (#39192)

2026-09-23 16:54:12 +00:00

versioned_migration

refactor: prepare to decouple the "model migration" package and "models" package (#38533)

2026-07-20 03:42:02 +00:00

webhook

fix(webhook): keep line breaks in Telegram rich messages (#39650) (#39677)

2026-10-08 13:31:11 +02:00

websocket

feat: Replace SSE with WebSocket for UI notifications (#36965)

2026-07-27 07:46:00 +00:00

webtheme

chore: enable forcetypeassert linter, fix issues (#38804)

2026-08-09 10:25:06 +00:00

wiki

feat: Add audit logging (#38189)

2026-09-12 08:15:23 +00:00