fix

wxiaoguang · wxiaoguang · commit f62e13e8fea1 · 2025-01-16T11:21:13.000+08:00
diff --git a/services/repository/branch.go b/services/repository/branch.go
@@ -685,7 +685,11 @@ func GetBranchDivergingInfo(ctx reqctx.RequestContext, baseRepo, headRepo *repo_
 		if err != nil {
 			return nil, err
 		}
-		hasPreviousCommit, _ := headCommit.HasPreviousCommit(baseGitBranch.CommitID)
+		baseCommitID, err := git.NewIDFromString(baseGitBranch.CommitID)
+		if err != nil {
+			return nil, err
+		}
+		hasPreviousCommit, _ := headCommit.HasPreviousCommit(baseCommitID)
 		info.BaseHasNewCommits = !hasPreviousCommit
 		return info, nil
 	}

Original file line number	Diff line number	Diff line change
`@@ -685,7 +685,11 @@ func GetBranchDivergingInfo(ctx reqctx.RequestContext, baseRepo, headRepo *repo_`
`685`	`685`	`if err != nil {`
`686`	`686`	`return nil, err`
`687`	`687`	`}`
`688`		`- hasPreviousCommit, _ := headCommit.HasPreviousCommit(baseGitBranch.CommitID)`
	`688`	`+ baseCommitID, err := git.NewIDFromString(baseGitBranch.CommitID)`
	`689`	`+ if err != nil {`
	`690`	`+ return nil, err`
	`691`	`+ }`
	`692`	`+ hasPreviousCommit, _ := headCommit.HasPreviousCommit(baseCommitID)`
`689`	`693`	`info.BaseHasNewCommits = !hasPreviousCommit`
`690`	`694`	`return info, nil`
`691`	`695`	`}`