Merge pull request #2087 from Bwko/fix_error_exit

Fix exit status 1 not handled @ getMergeCommit (#2087)
7 years ago · 12cb6cd3c9
parent 8fd43f215c b36849dc1f
commit 12cb6cd3c9
1 changed files with 1 additions and 1 deletions
--- a/models/pull.go
+++ b/models/pull.go
@ -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)