mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-04 02:26:22 +00:00 
			
		
		
		
	fixes wrong after field in webhook payload
when merge pull request
This commit is contained in:
		@@ -328,7 +328,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
 | 
			
		||||
		return fmt.Errorf("git push: %s", stderr)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	pr.MergedCommitID, err = headGitRepo.GetBranchCommitID(pr.HeadBranch)
 | 
			
		||||
	pr.MergedCommitID, err = headGitRepo.GetBranchCommitID(pr.BaseBranch)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return fmt.Errorf("GetBranchCommit: %v", err)
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user