fix(repo): /generate must sync the branch table for the new repo by agyss · Pull Request #37693 · go-gitea/gitea

agyss · 2026-05-13T18:00:17Z

fix(repo): /generate must sync the branch table
Two bugs in GenerateGitContent, the function behind
POST /api/v1/repos/{owner}/{template}/generate:

The new repository's refs were written to disk but the branch DB
table was never populated. Any API call that resolved a single
branch by name on the new repo — GET /branches/{name}, file
create/update/delete, branch protection — returned "branch does
not exist" until the first push fired the post-receive hook.
The function re-fetched the new repo row from the database but
reassigned its local pointer instead of writing through it, so the
caller — and the /generate 201 response — was left with the
pre-fetch state and reported an empty default_branch.

Two bugs in GenerateGitContent, the function behind POST /api/v1/repos/{owner}/{template}/generate: 1. The new repository's refs were written to disk but the `branch` DB table was never populated. Any API call that resolved a single branch by name on the new repo — GET /branches/{name}, file create/update/delete, branch protection — returned "branch does not exist" until the first push fired the post-receive hook. 2. The function re-fetched the new repo row from the database but reassigned its local pointer instead of writing through it, so the caller — and the /generate 201 response — was left with the pre-fetch state and reported an empty default_branch.

wxiaoguang · 2026-05-13T18:47:58Z

Sign in to view

+	if err != nil {
 		return fmt.Errorf("getRepositoryByID: %w", err)
 	}
+	*generateRepo = *refreshed


Is this change necessary?

I think the old code if generateRepo, err = repo_model.GetRepositoryByID(ctx, generateRepo.ID); err != nil { should also work?

I understand we want to update the original reference to track the new repo, so done like this. Otherwise we would loose track of the new.

Why if generateRepo, err = repo_model.GetRepositoryByID(ctx, generateRepo.ID); err != nil { doesn't work?

It also "update the original reference to track the new repo"

It is correct syntax in Golang

With the original code, we update the variable, with my proposed code the destination where the pointer points to.

Its different things. I would have wanted the original passed in Referenz to be updated such that the new object is tracked in the calling function as well.

Or my go understanding is wrong, possible, as not done a lot. I have full trust in you decision, so either is fine by me.

Yes, sytax both are correct, just different things.

OK, I think I know what you mean now ....

I see the CI failure, the problem is that the caller depends on the new value .... I think it is a design problem.

The callers should handle it. Will fix.

The root problem is from Set the default branch for repositories generated from templates (#19136) , it made a mess for the "default branch" handling.

The "generatedRepo" should have the default branch correctly set from beginning

lunny

LGTM except https://github.com/go-gitea/gitea/pull/37693/files#r3236684619

Signed-off-by: wxiaoguang <wxiaoguang@gmail.com>

wxiaoguang · 2026-05-15T07:24:45Z

Thank you very much! I cleaned up the legacy code a little, the "re-fetch" is also removed, I think it should be easier for future maintenance.

Made a backport with minimal changes: fix(repo): /generate must sync the branch table for the new repo #37712

) (#37712) Backport #37693

This PR contains the following updates: | Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) | |---|---|---|---| | [code.gitea.io/gitea](https://github.com/go-gitea/gitea) | `v1.26.1` → `v1.26.2` | ![age](https://developer.mend.io/api/mc/badges/age/go/code.gitea.io%2fgitea/v1.26.2?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/go/code.gitea.io%2fgitea/v1.26.1/v1.26.2?slim=true) | --- ### Release Notes <details> <summary>go-gitea/gitea (code.gitea.io/gitea)</summary> ### [`v1.26.2`](https://github.com/go-gitea/gitea/releases/tag/v1.26.2) [Compare Source](go-gitea/gitea@v1.26.1...v1.26.2) - SECURITY - fix(permissions): Fix reading permission ([#37769](go-gitea/gitea#37769)) - fix(actions): make artifact signature payloads unambiguous ([#37707](go-gitea/gitea#37707)) - fix: Unify public-only token filtering in API queries and repo access checks ([#37118](go-gitea/gitea#37118)) - fix: Add missed token scope checking ([#37735](go-gitea/gitea#37735)) - fix(oauth): bind token exchanges to the original client request ([#37704](go-gitea/gitea#37704)) - fix(oauth): strengthen PKCE validation and refresh token replay protection ([#37706](go-gitea/gitea#37706)) - fix(web): enforce token scopes on raw, media, and attachment downloads ([#37698](go-gitea/gitea#37698)) - fix(security): enforce wiki git writes and LFS token access at request time ([#37695](go-gitea/gitea#37695)) - feat(api): encrypt AWS creds ([#37679](go-gitea/gitea#37679)) - fix(deps): update dependency mermaid to v11.15.0 \[security], add e2e test - fix(packages): Add label for private and internal package and fix composor package source permission check ([#37610](go-gitea/gitea#37610)) - fix(git): Fix smart http request scope bug ([#37583](go-gitea/gitea#37583)) - Fix basic auth bug ([#37503](go-gitea/gitea#37503)) - Fix allow maintainer edit permission check ([#37479](go-gitea/gitea#37479)) ([#37484](go-gitea/gitea#37484)) - Fix URL sanitization to handle schemeless credentials ([#37440](go-gitea/gitea#37440)) ([#37471](go-gitea/gitea#37471)) - Fix attachment Content-Security-Policy ([#37455](go-gitea/gitea#37455)) ([#37464](go-gitea/gitea#37464)) - chore(deps): bump go-git/go-git/v5 to 5.19.0 ([#37608](go-gitea/gitea#37608)) - BUGFIXES - fix(pull): handle empty pull request files view to allow reviews ([#37783](go-gitea/gitea#37783)) - fix(markup): make RenderString never fail ([#37779](go-gitea/gitea#37779)) - fix: add natural sort to sortTreeViewNodes ([#37772](go-gitea/gitea#37772)) - fix: package creation unique conflict ([#37774](go-gitea/gitea#37774)) - fix!: add DEFAULT\_TITLE\_SOURCE setting for pull request title default behavior ([#37465](go-gitea/gitea#37465)) - fix: Allow direct commits for unprotected files with push restrictions ([#37657](go-gitea/gitea#37657)) - fix(actions): wrong assumption that run id always >= job id ([#37737](go-gitea/gitea#37737)) - fix(auth): set User-Agent on avatar fetch and sync avatar on link-account register ([#37564](go-gitea/gitea#37564)) ([#37588](go-gitea/gitea#37588)) - fix(actions): deadlock between PrepareRunAndInsert and UpdateTaskByState ([#37692](go-gitea/gitea#37692)) - fix(repo): /generate must sync the branch table for the new repo ([#37693](go-gitea/gitea#37693)) - build: Fix snap build (1.26) - fix(actions): run TransferLogs on UpdateLog{Rows:\[], NoMore:true} ([#37631](go-gitea/gitea#37631)) - fix show correct mergebase - fix: make clone URL respect public URL detection setting ([#37615](go-gitea/gitea#37615)) - fix: "run as root" check ([#37622](go-gitea/gitea#37622)) - chore(deps): update dependency go to v1.26.3 ([#37601](go-gitea/gitea#37601)) - Compare dropdown fails when selecting branch with no common merge-base ([#37470](go-gitea/gitea#37470)) - fix: treat email addresses case-insensitively ([#37600](go-gitea/gitea#37600)) - fix(actions): fix blank lines after ::endgroup:: ([#37597](go-gitea/gitea#37597)) - fix(actions): report individual step status in workflow job API response ([#37592](go-gitea/gitea#37592)) - fix: Invalid UTF-8 commit messages in JSON API responses ([#37542](go-gitea/gitea#37542)) - fix: use consistent GetUser family functions ([#37553](go-gitea/gitea#37553)) - fix(api): return 409 message instead of empty JSON for wrong commit id ([#37572](go-gitea/gitea#37572)) - fix(actions): prevent panic when workflow contains null jobs ([#37570](go-gitea/gitea#37570)) - Make ServeSetHeaders default to download attachment if filename exists ([#37552](go-gitea/gitea#37552)) ([#37555](go-gitea/gitea#37555)) - Fix(actions): validate workflow param to prevent 500 error ([#37546](go-gitea/gitea#37546)) ([#37554](go-gitea/gitea#37554)) - Don't unblock run-level-concurrency-blocked runs in the resolver ([#37461](go-gitea/gitea#37461)) ([#37538](go-gitea/gitea#37538)) - Fix(packages): use file names for generic web downloads ([#37514](go-gitea/gitea#37514)) ([#37520](go-gitea/gitea#37520)) - Fix merge autodetect can't close other PRs but only the last one when multiple PRs are pushed at once ([#37512](go-gitea/gitea#37512)) ([#37516](go-gitea/gitea#37516)) - Fix update branch protection order ([#37508](go-gitea/gitea#37508)) ([#37513](go-gitea/gitea#37513)) - Fix mCaptcha broken after Vite migration ([#37492](go-gitea/gitea#37492)) ([#37509](go-gitea/gitea#37509)) - Fix review submission from single-commit PR view ([#37475](go-gitea/gitea#37475)) ([#37485](go-gitea/gitea#37485)) - Fix scheduled action panic with null event payload ([#37459](go-gitea/gitea#37459)) ([#37466](go-gitea/gitea#37466)) - Make GetPossibleUserByID can handle deleted user ([#37430](go-gitea/gitea#37430)) ([#37431](go-gitea/gitea#37431)) - Remove excessive quote from terraform instructions ([#37424](go-gitea/gitea#37424)) ([#37426](go-gitea/gitea#37426)) - Fix color regressions, add `priority` color ([#37417](go-gitea/gitea#37417)) ([#37421](go-gitea/gitea#37421)) - MISC - Add CurrentURL template variable back ([#37444](go-gitea/gitea#37444)) ([#37449](go-gitea/gitea#37449)) Instances on **[Gitea Cloud](https://cloud.gitea.com)** will be automatically upgraded to this version during the specified maintenance window. </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Reviewed-on: https://git.erwanleboucher.dev/eleboucher/apoci/pulls/47

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 13, 2026

agyss force-pushed the fix/generate-syncs-branch-table branch from 7193d2a to 890ac15 Compare May 13, 2026 18:08

wxiaoguang reviewed May 13, 2026

View reviewed changes

Comment thread tests/integration/api_repo_generate_branch_sync_test.go Outdated

agyss force-pushed the fix/generate-syncs-branch-table branch from 890ac15 to 66eb1e3 Compare May 13, 2026 18:29

agyss force-pushed the fix/generate-syncs-branch-table branch from 66eb1e3 to 3286194 Compare May 13, 2026 18:41

wxiaoguang reviewed May 13, 2026

View reviewed changes

lunny approved these changes May 13, 2026

View reviewed changes

lunny added the type/bug label May 13, 2026

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 13, 2026

lunny added backport/v1.26 This PR should be backported to Gitea 1.26 and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 13, 2026

GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label May 13, 2026

wxiaoguang added 4 commits May 15, 2026 14:18

Update generate.go

fb2ab3f

Signed-off-by: wxiaoguang <wxiaoguang@gmail.com>

Update api_repo_test.go

4bd8469

Signed-off-by: wxiaoguang <wxiaoguang@gmail.com>

Update api_repo_test.go

f0d7f4d

Signed-off-by: wxiaoguang <wxiaoguang@gmail.com>

Merge branch 'main' into fix/generate-syncs-branch-table

f125f00

wxiaoguang approved these changes May 15, 2026

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 15, 2026

clean up

ac4843b

wxiaoguang added the backport/manual No power to the bots! Create your backport yourself! label May 15, 2026

wxiaoguang enabled auto-merge (squash) May 15, 2026 07:19

wxiaoguang mentioned this pull request May 15, 2026

fix(repo): /generate must sync the branch table for the new repo (#37693) #37712

Merged

wxiaoguang merged commit 5b3575a into go-gitea:main May 15, 2026
21 checks passed

GiteaBot added this to the 1.27.0 milestone May 15, 2026

wxiaoguang added a commit that referenced this pull request May 15, 2026

fix(repo): /generate must sync the branch table for the new repo (#37693

1d51631

) (#37712) Backport #37693

lunny added the backport/done All backports for this PR have been created label May 19, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix(repo): /generate must sync the branch table for the new repo#37693

fix(repo): /generate must sync the branch table for the new repo#37693
wxiaoguang merged 6 commits into
go-gitea:mainfrom
agyss:fix/generate-syncs-branch-table

agyss commented May 13, 2026 •

edited

Loading

Uh oh!

Uh oh!

wxiaoguang May 13, 2026

Uh oh!

agyss May 13, 2026

Uh oh!

wxiaoguang May 13, 2026

Uh oh!

wxiaoguang May 15, 2026

Uh oh!

agyss May 15, 2026

Uh oh!

agyss May 15, 2026

Uh oh!

This comment was marked as outdated.

Uh oh!

wxiaoguang May 15, 2026

Uh oh!

wxiaoguang May 15, 2026

Uh oh!

lunny left a comment

Uh oh!

Uh oh!

wxiaoguang commented May 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

agyss commented May 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment was marked as outdated.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lunny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

wxiaoguang commented May 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

agyss commented May 13, 2026 •

edited

Loading