Fix reverting a merge commit failing (#28794)#28825

lunny merged 2 commits intogo-gitea:release/v1.21go-gitea/gitea:release/v1.21from

me-heer:mergeCommitRevertFixBackportme-heer/gitea:mergeCommitRevertFixBackportCopy head branch name to clipboard