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

..

check_test.go

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

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

check.go

fix(pull): don't auto-detect empty pull requests as manually merged (#39807) (#39812)

2026-10-16 21:22:02 +02:00

comment_test.go

chore: still keep ctx in git.Repository struct for cat-file batch command (#38684)

2026-07-28 17:04:22 +00:00

comment.go

refactor: make git package handle all git operations (#38543)

2026-07-20 16:07:38 +00:00

commit_status_test.go

enhance(actions): only create filtered-out workflow commit status for required contexts (#38371)

2026-07-09 15:34:56 +00:00

commit_status.go

refactor: make git package handle all git operations (#38543)

2026-07-20 16:07:38 +00:00

edits.go

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

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

lfs.go

refactor: use WithRepo instead of WithDir for most git operations, clean up model migrations (#38555)

2026-07-21 12:18:00 +00:00

main_test.go

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

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

merge_ff_only.go

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

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

merge_merge.go

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

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

merge_prepare.go

chore: still keep ctx in git.Repository struct for cat-file batch command (#38684)

2026-07-28 17:04:22 +00:00

merge_rebase.go

fix: pass merge commit messages to git via stdin (#39269)

2026-09-19 13:04:53 +00:00

merge_squash.go

fix: pass merge commit messages to git via stdin (#39269)

2026-09-19 13:04:53 +00:00

merge_test.go

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

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

merge_tree_test.go

refactor: hide git repo path details from more packages (#38601)

2026-07-23 17:42:55 +00:00

merge_tree.go

chore: still keep ctx in git.Repository struct for cat-file batch command (#38684)

2026-07-28 17:04:22 +00:00

merge.go

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

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

patch_unmerged.go

refactor: use WithRepo instead of WithDir for most git operations, clean up model migrations (#38555)

2026-07-21 12:18:00 +00:00

patch.go

chore: still keep ctx in git.Repository struct for cat-file batch command (#38684)

2026-07-28 17:04:22 +00:00

protected_branch.go

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

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

pull_test.go

chore: still keep ctx in git.Repository struct for cat-file batch command (#38684)

2026-07-28 17:04:22 +00:00

pull.go

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

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

ref_test.go

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

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

ref.go

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

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

review_test.go

fix(pull): fix code context of review comments on unchanged lines (#39799) (#39805)

2026-10-16 11:53:17 +00:00

review.go

fix(pull): fix code context of review comments on unchanged lines (#39799) (#39805)

2026-10-16 11:53:17 +00:00

reviewer_test.go

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

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

reviewer.go

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

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

temp_repo.go

chore: raise minimum git version to 2.25 (#39131)

2026-08-26 18:35:44 +00:00

update_rebase.go

refactor: use WithRepo instead of WithDir for most git operations, clean up model migrations (#38555)

2026-07-21 12:18:00 +00:00

update_test.go

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

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

update.go

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

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