luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-06-08 15:47:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix push multiple branches error with tests (#31151)

Browse source 
(cherry picked from commit 5c1b550e00e9460078e00c41a32d206b260ef482)

Conflicts:
	tests/integration/git_push_test.go
	trivial context conflict because of
	2ac3dcbd43 test: hook post-receive for sha256 repos
(cherry picked from commit 62448bfb93)
(cherry picked from commit e8c776c79384c1c0a4d707ce5084b27347703848)
This commit is contained in:
Lunny Xiao 2024-05-29 14:43:02 +08:00 • committed by Earl Warren
parent 4d0a5ea317
commit d462b6d495
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
3 changed files with 54 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
services/repository/branch.go
View file

@ -296,7 +296,7 @@ func SyncBranchesToDB(ctx context.Context, repoID, pusherID int64, branchNames,
if _, err := git_model.UpdateBranch(ctx, repoID, pusherID, branchName, commit); err != nil {
return fmt.Errorf("git_model.UpdateBranch %d:%s failed: %v", repoID, branchName, err)
}
return nil
continue
}
// if database have branches but not this branch, it means this is a new branch