fix

wxiaoguang · wxiaoguang · commit cf1949ca395f · 2025-03-24T19:45:45.000+08:00
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
@@ -1276,11 +1276,10 @@ func PullsNewRedirect(ctx *context.Context) {
 	if repo.IsFork {
 		if err := repo.GetBaseRepo(ctx); err != nil {
 			ctx.ServerError("GetBaseRepo", err)
+			return
 		}
-		if repo.BaseRepo != nil {
-			redirectRepo = repo.BaseRepo
-			branch = fmt.Sprintf("%s:%s", repo.OwnerName, branch)
-		}
+		redirectRepo = repo.BaseRepo
+		branch = fmt.Sprintf("%s:%s", repo.OwnerName, branch)
 	}
 	ctx.Redirect(fmt.Sprintf("%s/compare/%s...%s?expand=1", redirectRepo.Link(), util.PathEscapeSegments(redirectRepo.DefaultBranch), util.PathEscapeSegments(branch)))
 }

Original file line number	Diff line number	Diff line change
`@@ -1276,11 +1276,10 @@ func PullsNewRedirect(ctx *context.Context) {`
`1276`	`1276`	`if repo.IsFork {`
`1277`	`1277`	`if err := repo.GetBaseRepo(ctx); err != nil {`
`1278`	`1278`	`ctx.ServerError("GetBaseRepo", err)`
	`1279`	`+ return`
`1279`	`1280`	`}`
`1280`		`- if repo.BaseRepo != nil {`
`1281`		`- redirectRepo = repo.BaseRepo`
`1282`		`- branch = fmt.Sprintf("%s:%s", repo.OwnerName, branch)`
`1283`		`- }`
	`1281`	`+ redirectRepo = repo.BaseRepo`
	`1282`	`+ branch = fmt.Sprintf("%s:%s", repo.OwnerName, branch)`
`1284`	`1283`	`}`
`1285`	`1284`	`ctx.Redirect(fmt.Sprintf("%s/compare/%s...%s?expand=1", redirectRepo.Link(), util.PathEscapeSegments(redirectRepo.DefaultBranch), util.PathEscapeSegments(branch)))`
`1286`	`1285`	`}`