fix lint

wxiaoguang · wxiaoguang · commit 1db2a9a2299b · 2024-12-12T11:46:32.000+08:00
diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go
@@ -1096,23 +1096,20 @@ type parseCompareInfoResult struct {
 }
 
 // parseCompareInfo returns non-nil if it succeeds, it always writes to the context and returns nil if it fails
-func parseCompareInfo(ctx *context.APIContext, form api.CreatePullRequestOption) (result *parseCompareInfoResult, closer func() error) {
+func parseCompareInfo(ctx *context.APIContext, form api.CreatePullRequestOption) (result *parseCompareInfoResult, closer func()) {
 	var err error
 	// Get compared branches information
 	// format: <base branch>...[<head repo>:]<head branch>
 	// base<-head: master...head:feature
 	// same repo: master...feature
 	baseRepo := ctx.Repo.Repository
 	baseRefToGuess := form.Base
-	headRefToGuess := form.Head
-
-	var headUser *user_model.User
 
-	headInfos := strings.Split(form.Head, ":")
-	if len(headInfos) == 1 {
+	headUser := ctx.Repo.Owner
+	headRefToGuess := form.Head
+	if headInfos := strings.Split(form.Head, ":"); len(headInfos) == 1 {
 		// If there is no head repository, it means pull request between same repository.
-		headUser = ctx.Repo.Owner
-		headRefToGuess = headInfos[0]
+		// Do nothing here because the head variables have been assigned above.
 	} else if len(headInfos) == 2 {
 		// There is a head repository (the head repository could also be the same base repo)
 		headRefToGuess = headInfos[1]
@@ -1155,14 +1152,14 @@ func parseCompareInfo(ctx *context.APIContext, form api.CreatePullRequestOption)
 	if isSameRepo {
 		headRepo = ctx.Repo.Repository
 		headGitRepo = ctx.Repo.GitRepo
-		closer = func() error { return nil } // no need to close the head repo because it shares the base repo
+		closer = func() {} // no need to close the head repo because it shares the base repo
 	} else {
 		headGitRepo, err = gitrepo.OpenRepository(ctx, headRepo)
 		if err != nil {
 			ctx.Error(http.StatusInternalServerError, "OpenRepository", err)
 			return nil, nil
 		}
-		closer = headGitRepo.Close
+		closer = func() { _ = headGitRepo.Close() }
 	}
 	defer func() {
 		if result == nil && !isSameRepo {
diff --git a/tests/integration/api_repo_compare_test.go b/tests/integration/api_repo_compare_test.go
@@ -36,7 +36,7 @@ func TestAPICompareBranches(t *testing.T) {
 		assert.Len(t, apiResp.Commits, 2)
 	})
 
-	t.Run("CompareBranches", func(t *testing.T) {
+	t.Run("CompareCommits", func(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
 		req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo20/compare/808038d2f71b0ab02099...c8e31bc7688741a5287f").AddTokenAuth(token)
 		resp := MakeRequest(t, req, http.StatusOK)
