Merge branch 'release/v1.25' into backport-35864-v1.25

GiteaBot · web-flow · commit 089b1b063008 · 2025-11-06T14:04:38.000+08:00
diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go
@@ -369,11 +369,11 @@ func ReqChangeRepoFileOptionsAndCheck(ctx *context.APIContext) {
 		},
 		Signoff: commonOpts.Signoff,
 	}
-	if commonOpts.Dates.Author.IsZero() {
-		commonOpts.Dates.Author = time.Now()
+	if changeFileOpts.Dates.Author.IsZero() {
+		changeFileOpts.Dates.Author = time.Now()
 	}
-	if commonOpts.Dates.Committer.IsZero() {
-		commonOpts.Dates.Committer = time.Now()
+	if changeFileOpts.Dates.Committer.IsZero() {
+		changeFileOpts.Dates.Committer = time.Now()
 	}
 	ctx.Data["__APIChangeRepoFilesOptions"] = changeFileOpts
 }

Original file line number	Diff line number	Diff line change
`@@ -369,11 +369,11 @@ func ReqChangeRepoFileOptionsAndCheck(ctx *context.APIContext) {`
`369`	`369`	`},`
`370`	`370`	`Signoff: commonOpts.Signoff,`
`371`	`371`	`}`
`372`		`- if commonOpts.Dates.Author.IsZero() {`
`373`		`- commonOpts.Dates.Author = time.Now()`
	`372`	`+ if changeFileOpts.Dates.Author.IsZero() {`
	`373`	`+ changeFileOpts.Dates.Author = time.Now()`
`374`	`374`	`}`
`375`		`- if commonOpts.Dates.Committer.IsZero() {`
`376`		`- commonOpts.Dates.Committer = time.Now()`
	`375`	`+ if changeFileOpts.Dates.Committer.IsZero() {`
	`376`	`+ changeFileOpts.Dates.Committer = time.Now()`
`377`	`377`	`}`
`378`	`378`	`ctx.Data["__APIChangeRepoFilesOptions"] = changeFileOpts`
`379`	`379`	`}`