mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 11:28:24 +00:00 
			
		
		
		
	Add rebase push display wrong comments bug (#35560)
Fix #35518 --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
		| @@ -63,6 +63,7 @@ func CreatePushPullComment(ctx context.Context, pusher *user_model.User, pr *iss | ||||
| 	var data issues_model.PushActionContent | ||||
| 	if opts.IsForcePush { | ||||
| 		data.CommitIDs = []string{oldCommitID, newCommitID} | ||||
| 		data.IsForcePush = true | ||||
| 	} else { | ||||
| 		data.CommitIDs, err = getCommitIDsFromRepo(ctx, pr.BaseRepo, oldCommitID, newCommitID, pr.BaseBranch) | ||||
| 		if err != nil { | ||||
|   | ||||
| @@ -243,6 +243,17 @@ func ChangeTargetBranch(ctx context.Context, pr *issues_model.PullRequest, doer | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	exist, err := git_model.IsBranchExist(ctx, pr.BaseRepoID, targetBranch) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 	if !exist { | ||||
| 		return git_model.ErrBranchNotExist{ | ||||
| 			RepoID:     pr.BaseRepoID, | ||||
| 			BranchName: targetBranch, | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	// Check if branches are equal | ||||
| 	branchesEqual, err := IsHeadEqualWithBranch(ctx, pr, targetBranch) | ||||
| 	if err != nil { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user