Fix bug when pushing mirror with wiki#36795
Merged
lunny merged 6 commits intogo-gitea:mainfrom Mar 2, 2026
Merged
Conversation
GiteaBot
added
the
lgtm/need 2
github-actions
bot
added
modifies/go
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes #36736 by ensuring push-mirror updates to a repository’s wiki aren’t incorrectly blocked by the main repository default-branch deletion protection.
Changes:
- Propagate “is wiki” context through hook option payloads so private hook endpoints can apply wiki-specific rules.
- In pre-receive branch checks, use
DefaultWikiBranch(instead ofDefaultBranch) when handling wiki pushes to prevent false “default branch cannot be deleted” rejections. - Add an integration test covering a wiki/default-branch mismatch scenario during push-mirror sync.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
tests/integration/mirror_push_test.go |
Adds an integration test reproducing the wiki default-branch mismatch failure during push-mirror sync. |
routers/private/hook_pre_receive.go |
Adjusts default-branch deletion protection to use DefaultWikiBranch for wiki pushes. |
cmd/hook.go |
Passes IsWiki through private.HookOptions so private hook handlers can distinguish wiki pushes. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
silverwind
approved these changes
Mar 2, 2026
GiteaBot
added
lgtm/need 1
wxiaoguang
reviewed
Mar 2, 2026
wxiaoguang
approved these changes
Mar 2, 2026
GiteaBot
added
lgtm/done
lunny
added
the
reviewed/wait-merge
Collaborator
|
I was unable to create a backport for 1.25. @lunny, please send one manually. 🍵 |
GiteaBot
added
backport/manual
lunny
added a commit
to lunny/gitea
that referenced
this pull request
Mar 2, 2026
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Mar 4, 2026
* giteaofficial/main:
[skip ci] Updated translations via Crowdin
fix: /repos/{owner}/{repo}/actions/{runs,jobs} requiring owner permissions (go-gitea#36818)
Fix CRAN package version validation to allow more than 4 version components (go-gitea#36813)
Fix API not persisting pull request unit config when has_pull_requests is not set (go-gitea#36718)
feat: Add Actions API rerun endpoints for runs and jobs (go-gitea#36768)
Fix bug when pushing mirror with wiki (go-gitea#36795)
Pull Request Pusher should be the author of the merge (go-gitea#36581)
Delete non-exist branch should return 404 (go-gitea#36694)
Remove API registration-token (go-gitea#36801)
Add background and run count to actions list page (go-gitea#36707)
silverwind
pushed a commit
that referenced
this pull request
Mar 6, 2026
silverwind
added a commit
to silverwind/gitea
that referenced
this pull request
Mar 6, 2026
* origin/main: (27 commits) Fix OAuth2 authorization code expiry and reuse handling (go-gitea#36797) Fix org permission API visibility checks for hidden members and private orgs (go-gitea#36798) Fix non-admins unable to automerge PRs from forks (go-gitea#36833) upgrade to github.com/cloudflare/circl 1.6.3, svgo 4.0.1, markdownlint-cli 0.48.0 (go-gitea#36837) Fix dump release asset bug (go-gitea#36799) build(deps): update material-icon-theme v5.32.0 (go-gitea#36832) Fix bug to check whether user can update pull request branch or rebase branch (go-gitea#36465) Fix forwarded proto handling for public URL detection (go-gitea#36810) Fix artifacts v4 backend upload problems (go-gitea#36805) Add a git grep search timeout (go-gitea#36809) fix(repo): unify DEFAULT_SHOW_FULL_NAME output in templates and dropdown (go-gitea#36597) Harden render iframe open-link handling (go-gitea#36811) [skip ci] Updated translations via Crowdin fix: /repos/{owner}/{repo}/actions/{runs,jobs} requiring owner permissions (go-gitea#36818) Fix CRAN package version validation to allow more than 4 version components (go-gitea#36813) Fix API not persisting pull request unit config when has_pull_requests is not set (go-gitea#36718) feat: Add Actions API rerun endpoints for runs and jobs (go-gitea#36768) Fix bug when pushing mirror with wiki (go-gitea#36795) Pull Request Pusher should be the author of the merge (go-gitea#36581) Delete non-exist branch should return 404 (go-gitea#36694) ... # Conflicts: # routers/web/repo/issue_view.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix #36736
Generated by a coding agent with Codex 5.2