Skip updating timestamp when sync branch (go-gitea#34875)

wxiaoguang · web-flow · commit 5d5b69552746 · 2025-06-26T17:59:06.000-07:00
diff --git a/modules/repository/branch.go b/modules/repository/branch.go
@@ -41,11 +41,14 @@ func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository,
 	if err != nil {
 		return 0, fmt.Errorf("GetObjectFormat: %w", err)
 	}
-	_, err = db.GetEngine(ctx).ID(repo.ID).Update(&repo_model.Repository{ObjectFormatName: objFmt.Name()})
-	if err != nil {
-		return 0, fmt.Errorf("UpdateRepository: %w", err)
+
+	if repo.ObjectFormatName != objFmt.Name() {
+		repo.ObjectFormatName = objFmt.Name()
+		_, err = db.GetEngine(ctx).ID(repo.ID).NoAutoTime().Update(&repo_model.Repository{ObjectFormatName: objFmt.Name()})
+		if err != nil {
+			return 0, fmt.Errorf("UpdateRepository: %w", err)
+		}
 	}
-	repo.ObjectFormatName = objFmt.Name() // keep consistent with db
 
 	allBranches := container.Set[string]{}
 	{

Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,14 @@ func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository,`
`41`	`41`	`if err != nil {`
`42`	`42`	`return 0, fmt.Errorf("GetObjectFormat: %w", err)`
`43`	`43`	`}`
`44`		`- _, err = db.GetEngine(ctx).ID(repo.ID).Update(&repo_model.Repository{ObjectFormatName: objFmt.Name()})`
`45`		`- if err != nil {`
`46`		`- return 0, fmt.Errorf("UpdateRepository: %w", err)`
	`44`	`+`
	`45`	`+ if repo.ObjectFormatName != objFmt.Name() {`
	`46`	`+ repo.ObjectFormatName = objFmt.Name()`
	`47`	`+ _, err = db.GetEngine(ctx).ID(repo.ID).NoAutoTime().Update(&repo_model.Repository{ObjectFormatName: objFmt.Name()})`
	`48`	`+ if err != nil {`
	`49`	`+ return 0, fmt.Errorf("UpdateRepository: %w", err)`
	`50`	`+ }`
`47`	`51`	`}`
`48`		`- repo.ObjectFormatName = objFmt.Name() // keep consistent with db`
`49`	`52`
`50`	`53`	`allBranches := container.Set[string]{}`
`51`	`54`	`{`