summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2024-12-12 20:28:23 +0100
committerEarl Warren <contact@earl-warren.org>2024-12-15 09:45:10 +0100
commit2b5c69c451a684b20119e2521dc23734c7869241 (patch)
tree325388e2913aea14366476a0243731991e081f04 /services
parentImplement update branch API (#32433) (diff)
downloadforgejo-2b5c69c451a684b20119e2521dc23734c7869241.tar.xz
forgejo-2b5c69c451a684b20119e2521dc23734c7869241.zip
Detect whether action view branch was deleted (#32764)
Fix #32761 ![图片](https://github.com/user-attachments/assets/a5a7eef8-0fea-4242-b199-1b0b73d9bbdb) (cherry picked from commit 6370d2fb93a5ee897b82969ca30a9feb33667714) Conflicts: routers/web/repo/actions/actions.go routers/web/repo/actions/view.go trivial context conflicts
Diffstat (limited to 'services')
-rw-r--r--services/repository/branch.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/repository/branch.go b/services/repository/branch.go
index 87fe03c12d..8e1a6cd27f 100644
--- a/services/repository/branch.go
+++ b/services/repository/branch.go
@@ -254,7 +254,7 @@ func SyncBranchesToDB(ctx context.Context, repoID, pusherID int64, branchNames,
}
return db.WithTx(ctx, func(ctx context.Context) error {
- branches, err := git_model.GetBranches(ctx, repoID, branchNames)
+ branches, err := git_model.GetBranches(ctx, repoID, branchNames, true)
if err != nil {
return fmt.Errorf("git_model.GetBranches: %v", err)
}