mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	Merge pull request #2087 from Bwko/fix_error_exit
Fix exit status 1 not handled @ getMergeCommit (#2087)
This commit is contained in:
		@@ -495,7 +495,7 @@ func (pr *PullRequest) getMergeCommit() (*git.Commit, error) {
 | 
			
		||||
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		// Errors are signaled by a non-zero status that is not 1
 | 
			
		||||
		if err.Error() == "exit status 1" {
 | 
			
		||||
		if strings.Contains(err.Error(), "exit status 1") {
 | 
			
		||||
			return nil, nil
 | 
			
		||||
		}
 | 
			
		||||
		return nil, fmt.Errorf("git merge-base --is-ancestor: %v %v", stderr, err)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user