fix

go-gitea · Jan 11, 2025 · 845c70c · 845c70c
1 parent 6e105e4
commit 845c70c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/routers/web/repo/view_home.go b/routers/web/repo/view_home.go
@@ -227,7 +227,7 @@ func prepareRecentlyPushedNewBranches(ctx *context.Context) {
 					continue
 				}
 				// Base is the pushed branch (for fork branch or local pushed branch perspective)
-				if divergingInfo.BaseIsNewer || divergingInfo.CommitsAhead > 0 {
+				if divergingInfo.BaseIsNewer || divergingInfo.CommitsBehind > 0 {
 					finalBranches = append(finalBranches, branch)
 				}
 			}

diff --git a/services/repository/branch.go b/services/repository/branch.go
@@ -651,8 +651,8 @@ type BranchDivergingInfo struct {
 }
 
 // getBranchDivergingInfo returns the information about the divergence of a patch branch to the base branch.
-func GetBranchDivergingInfo(ctx reqctx.RequestContext, baseRepo, headRepo *repo_model.Repository, baseBranch, headbranch string) (*BranchDivergingInfo, error) {
-	headGitBranch, err := git_model.GetBranch(ctx, headRepo.ID, headbranch)
+func GetBranchDivergingInfo(ctx reqctx.RequestContext, baseRepo, headRepo *repo_model.Repository, baseBranch, headBranch string) (*BranchDivergingInfo, error) {
+	headGitBranch, err := git_model.GetBranch(ctx, headRepo.ID, headBranch)
 	if err != nil {
 		return nil, err
 	}