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

..

attribute

fix(git): avoid unnecessary timers during language stats (#39531) (#39535)

2026-10-01 19:44:48 +00:00

foreachref

fix(release): separate publication time from the release date (#36761)

2026-08-22 08:59:37 +00:00

gitcmd

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

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

gitrepo

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

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

internal

Refactor git command package to improve security and maintainability (#22678)

2023-02-04 10:30:43 +08:00

languagestats

fix: recognize linguist language aliases (#39135)

2026-08-26 17:24:07 +02:00

pipeline

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

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

tests/repos

refactor: git repo and relative path handling (#38522)

2026-07-19 07:32:00 +00:00

url

fix(httplib): prevent leaking localhost:3000 in public links (#39217)

2026-09-02 19:32:33 +00:00

archive_test.go

fix(repo): avoid a repo-sized temp file for every bundle download (#38863)

2026-08-11 16:33:15 +00:00

archive.go

fix(repo): avoid a repo-sized temp file for every bundle download (#38863)

2026-08-11 16:33:15 +00:00

blame_sha256_test.go

fix(migrations): preserve SHA-256 pull request commit IDs (#39343)

2026-09-19 12:41:41 +00:00

blame_test.go

fix(migrations): preserve SHA-256 pull request commit IDs (#39343)

2026-09-19 12:41:41 +00:00

blame.go

fix(migrations): preserve SHA-256 pull request commit IDs (#39343)

2026-09-19 12:41:41 +00:00

blob_gogit.go

refactor: remove Ctx field from git.Repository (#38500)

2026-07-17 18:44:31 +08:00

blob_nogogit.go

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

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

blob_test.go

fix: git diff blob excerpt (#38808)

2026-08-07 02:44:55 +00:00

blob.go

fix: git diff blob excerpt (#38808)

2026-08-07 02:44:55 +00:00

branch.go

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

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

catfile_batch_command.go

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

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

catfile_batch_legacy.go

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

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

catfile_batch_reader.go

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

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

catfile_batch_test.go

refactor: clean up git repo and model migration packages (#38564)

2026-07-23 01:22:26 +00:00

catfile_batch.go

refactor: clean up git repo and model migration packages (#38564)

2026-07-23 01:22:26 +00:00

clone.go

refactor: clean up git repo and model migration packages (#38564)

2026-07-23 01:22:26 +00:00

cmdverb.go

Fix a bug when uploading file via lfs ssh command (#34408)

2025-05-09 16:17:08 +00:00

commit2_test.go

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

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

commit2.go

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

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

commit_convert_gogit.go

fix(api): commit tree SHA is the commit ID (#39449)

2026-09-29 11:56:51 +00:00

commit_count_cache.go

fix: git cache (#38763)

2026-08-05 00:17:07 +08:00

commit_file_test.go

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

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

commit_file.go

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

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

commit_info_gogit.go

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

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

commit_info_nogogit_test.go

fix: git cache (#38763)

2026-08-05 00:17:07 +08:00

commit_info_nogogit.go

fix: repo home page 500 due to the timeout of "get last commit info" (#38678)

2026-07-28 19:12:53 +08:00

commit_info_test.go

fix: git cache (#38763)

2026-08-05 00:17:07 +08:00

commit_info.go

fix: git cache (#38763)

2026-08-05 00:17:07 +08:00

commit_message_test.go

enhance: improve commit page header (#39229)

2026-09-06 11:27:04 +02:00

commit_message.go

enhance: improve commit page header (#39229)

2026-09-06 11:27:04 +02:00

commit_reader.go

refactor: decouple git.Repository(ctx) from git.Commit & git.Tree (#38464)

2026-07-15 17:30:01 +00:00

commit_sha256_test.go

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

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

commit_submodule_file_test.go

fix(git): return no submodule web link when the URL cannot be parsed (#39274) (#39592)

2026-10-04 14:00:15 +00:00

commit_submodule_file.go

fix(git): return no submodule web link when the URL cannot be parsed (#39274) (#39592)

2026-10-04 14:00:15 +00:00

commit_submodule.go

refactor: remove Ctx field from git.Repository (#38500)

2026-07-17 18:44:31 +08:00

commit_test.go

fix(migrations): preserve SHA-256 pull request commit IDs (#39343)

2026-09-19 12:41:41 +00:00

commit.go

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

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

compare_test.go

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

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

compare.go

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

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

config_managed.go

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

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

config_submodule_test.go

Fix submodule parsing (#32571)

2024-11-20 19:26:12 +00:00

config_submodule.go

Fix submodule parsing (#32571)

2024-11-20 19:26:12 +00:00

config_test.go

fix(git): match git config values exactly when syncing (#39728) (#39729)

2026-10-10 20:06:48 +02:00

config.go

fix(git): match git config values exactly when syncing (#39728) (#39729)

2026-10-10 20:06:48 +02:00

diff_test.go

Run gopls modernize on codebase (#34751)

2025-06-18 01:48:09 +00:00

diff.go

enhance: truncate but show long lines in diffs (#39279)

2026-09-12 11:56:25 +00:00

error.go

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

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

fastimport.go

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

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

fetch.go

fix: skip commit-graph write when fetching remote commits (#39798)

2026-10-15 14:13:52 +00:00

fsck.go

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

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

git_test.go

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

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

git.go

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

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

gitrepo.go

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

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

gpg_test.go

fix(asymkey): do not verify OpenPGP signatures with an SSH instance key, require git 2.18 (#39073)

2026-08-25 12:02:31 +00:00

gpg.go

fix(process): reap entire process group on cmd.Cancel (#39143)

2026-08-29 19:54:07 +00:00

grep_test.go

fix(git): keep leading dashes in git grep search patterns (#39404)

2026-09-24 09:46:24 +00:00

grep.go

fix(git): keep leading dashes in git grep search patterns (#39404)

2026-09-24 09:46:24 +00:00

hook.go

refactor: retry file remove/rename when a file is busy and clean up os detection (#38588)

2026-07-23 14:31:29 +00:00

hooks_test.go

fix(git): restrict hook permissions (#39008)

2026-08-21 07:52:23 +00:00

hooks.go

fix(git): restrict hook permissions (#39008)

2026-08-21 07:52:23 +00:00

key.go

fix(asymkey): do not verify OpenPGP signatures with an SSH instance key, require git 2.18 (#39073)

2026-08-25 12:02:31 +00:00

last_commit_cache_gogit.go

fix: git cache (#38763)

2026-08-05 00:17:07 +08:00

last_commit_cache_nogogit.go

fix: git cache (#38763)

2026-08-05 00:17:07 +08:00

last_commit_cache.go

fix: git cache (#38763)

2026-08-05 00:17:07 +08:00

localfs.go

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

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

log_name_status_nogogit.go

refactor: remove Path field from git.Repository (#38552)

2026-07-20 18:03:28 +00:00

main_test.go

refactor: clean up git repo and model migration packages (#38564)

2026-07-23 01:22:26 +00:00

merge_tree_test.go

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

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

merge_tree.go

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

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

merge.go

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

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

notes_test.go

fix(api): commit tree SHA is the commit ID (#39449)

2026-09-29 11:56:51 +00:00

notes.go

fix: git cache (#38763)

2026-08-05 00:17:07 +08:00

object_format.go

fix(migrations): preserve SHA-256 pull request commit IDs (#39343)

2026-09-19 12:41:41 +00:00

object_id_gogit.go

Add support for sha256 repositories (#23894)

2024-01-19 17:05:02 +01:00

object_id_test.go

fix(migrations): preserve SHA-256 pull request commit IDs (#39343)

2026-09-19 12:41:41 +00:00

object_id.go

fix(migrations): preserve SHA-256 pull request commit IDs (#39343)

2026-09-19 12:41:41 +00:00

parse_treeentry_test.go

refactor: simplify ParseCatFileTreeLine and catBatchParseTreeEntries (#37210)

2026-04-14 12:03:26 +00:00

parse_treeentry.go

fix: catch and fix more lint problems (#37674)

2026-05-13 09:00:41 +02:00

parse.go

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

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

push.go

refactor: clean up git repo and model migration packages (#38564)

2026-07-23 01:22:26 +00:00

receive_fsck_test.go

fix(git): reject fsck-invalid objects on push (#39472)

2026-09-29 20:31:50 +02: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

fix(migrations): preserve SHA-256 pull request commit IDs (#39343)

2026-09-19 12:41:41 +00:00

remote_managed.go

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

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

remote.go

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

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

repo_base_gogit.go

fix(git): tolerate concurrent repacks in go-git storage (#39536) (#39556)

2026-10-03 02:44:06 +00:00

repo_base_nogogit_test.go

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

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

repo_base_nogogit.go

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

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

repo_blob_test.go

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

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

repo_blob.go

Fix panic when get editor config file (#36241)

2025-12-25 19:26:23 -08:00

repo_branch_gogit.go

refactor: remove Ctx field from git.Repository (#38500)

2026-07-17 18:44:31 +08:00

repo_branch_nogogit.go

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

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

repo_branch_test.go

fix(git): tolerate concurrent repacks in go-git storage (#39536) (#39556)

2026-10-03 02:44:06 +00:00

repo_branch.go

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

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

repo_commit_gogit.go

fix(migrations): preserve SHA-256 pull request commit IDs (#39343)

2026-09-19 12:41:41 +00:00

repo_commit_nogogit.go

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

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

repo_commit_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

repo_commit.go

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

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

repo_commitgraph_gogit.go

refactor: clean up git repo and model migration packages (#38564)

2026-07-23 01:22:26 +00:00

repo_commitgraph.go

fix(asymkey): do not verify OpenPGP signatures with an SSH instance key, require git 2.18 (#39073)

2026-08-25 12:02:31 +00:00

repo_compare_test.go

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

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

repo_compare.go

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

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

repo_index.go

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

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

repo_object.go

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

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

repo_ref_gogit.go

refactor: remove Path field from git.Repository (#38552)

2026-07-20 18:03:28 +00:00

repo_ref_nogogit.go

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

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

repo_ref_test.go

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

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

repo_ref.go

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

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

repo_stats_test.go

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

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

repo_stats.go

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

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

repo_tag_gogit.go

refactor: remove Ctx field from git.Repository (#38500)

2026-07-17 18:44:31 +08:00

repo_tag_nogogit.go

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

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

repo_tag_test.go

fix(release): separate publication time from the release date (#36761)

2026-08-22 08:59:37 +00:00

repo_tag.go

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

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

repo_test.go

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

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

repo_tree_gogit.go

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

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

repo_tree_nogogit.go

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

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

repo_tree.go

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

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

repo.go

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

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

signature_gogit.go

Refactor parseSignatureFromCommitLine (#29054)

2024-02-09 11:02:53 +08:00

signature_nogogit.go

fix(repo): commit page fails to render unsigned commits with a different committer (#39381)

2026-09-23 14:34:19 +00:00

signature_test.go

Enable testifylint rules (#34075)

2025-03-31 01:53:48 -04:00

signature.go

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

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

size.go

refactor: clean up git repo and model migration packages (#38564)

2026-07-23 01:22:26 +00:00

submodule_test.go

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

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

submodule.go

refactor: clean up git repo and model migration packages (#38564)

2026-07-23 01:22:26 +00:00

tag_test.go

fix: Invalid UTF-8 commit messages in JSON API responses (#37542)

2026-05-07 16:19:45 +02:00

tag.go

fix(release): separate publication time from the release date (#36761)

2026-08-22 08:59:37 +00:00

tree_blob_gogit.go

refactor: decouple git.Repository(ctx) from git.Commit & git.Tree (#38464)

2026-07-15 17:30:01 +00:00

tree_blob_nogogit.go

refactor: decouple git.Repository(ctx) from git.Commit & git.Tree (#38464)

2026-07-15 17:30:01 +00:00

tree_blob.go

refactor: decouple git.Repository(ctx) from git.Commit & git.Tree (#38464)

2026-07-15 17:30:01 +00:00

tree_entry_common_test.go

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

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

tree_entry_gogit_test.go

fix: catch and fix more lint problems (#37674)

2026-05-13 09:00:41 +02:00

tree_entry_gogit.go

refactor: decouple git.Repository(ctx) from git.Commit & git.Tree (#38464)

2026-07-15 17:30:01 +00:00

tree_entry_mode.go

refactor: simplify ParseCatFileTreeLine and catBatchParseTreeEntries (#37210)

2026-04-14 12:03:26 +00:00

tree_entry_nogogit.go

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

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

tree_entry_test.go

refactor: simplify ParseCatFileTreeLine and catBatchParseTreeEntries (#37210)

2026-04-14 12:03:26 +00:00

tree_entry.go

refactor: remove Ctx field from git.Repository (#38500)

2026-07-17 18:44:31 +08:00

tree_gogit.go

refactor: decouple git.Repository(ctx) from git.Commit & git.Tree (#38464)

2026-07-15 17:30:01 +00:00

tree_nogogit.go

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

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

tree_test.go

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

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

tree.go

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

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

utils_test.go

Fix various bugs (#35177)

2025-07-30 07:08:59 +00:00

utils.go

fix(asymkey): do not verify OpenPGP signatures with an SSH instance key, require git 2.18 (#39073)

2026-08-25 12:02:31 +00:00