Skip to content

Commit 0917830

Browse files
authored
Update only the repository columns that need updating (#12900) (#12912)
Backport #12900 We should only update is_empty, default_branch and updated time columns during commitRepoAction and not update other columns as we risk overwriting incorrect information. Fix #11823 Fix #10536 Signed-off-by: Andrew Thornton <[email protected]>
1 parent 23aae32 commit 0917830

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

modules/repofiles/action.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"encoding/json"
99
"fmt"
1010
"html"
11+
"time"
1112

1213
"code.gitea.io/gitea/models"
1314
"code.gitea.io/gitea/modules/git"
@@ -176,7 +177,7 @@ func CommitRepoAction(optsList ...*CommitRepoActionOptions) error {
176177
var err error
177178
if repo != nil {
178179
// Change repository empty status and update last updated time.
179-
if err := models.UpdateRepository(repo, false); err != nil {
180+
if err := models.UpdateRepositoryUpdatedTime(repo.ID, time.Now()); err != nil {
180181
return fmt.Errorf("UpdateRepository: %v", err)
181182
}
182183
}
@@ -204,6 +205,10 @@ func CommitRepoAction(optsList ...*CommitRepoActionOptions) error {
204205
}
205206
gitRepo.Close()
206207
}
208+
// Update the is empty and default_branch columns
209+
if err := models.UpdateRepositoryCols(repo, "default_branch", "is_empty"); err != nil {
210+
return fmt.Errorf("UpdateRepositoryCols: %v", err)
211+
}
207212
}
208213

209214
opType := models.ActionCommitRepo
@@ -274,7 +279,7 @@ func CommitRepoAction(optsList ...*CommitRepoActionOptions) error {
274279

275280
if repo != nil {
276281
// Change repository empty status and update last updated time.
277-
if err := models.UpdateRepository(repo, false); err != nil {
282+
if err := models.UpdateRepositoryUpdatedTime(repo.ID, time.Now()); err != nil {
278283
return fmt.Errorf("UpdateRepository: %v", err)
279284
}
280285
}

0 commit comments

Comments
 (0)