Merge pull request #2087 from Bwko/fix_error_exit

lafriks · web-flow · commit 12cb6cd3c9b7 · 2017-06-30T15:46:49.000+03:00
Fix exit status 1 not handled @ getMergeCommit (#2087)
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,7 @@ func (pr PullRequest) getMergeCommit() (git.Commit, error) {`
`495`	`495`
`496`	`496`	`if err != nil {`
`497`	`497`	`// Errors are signaled by a non-zero status that is not 1`
`498`		`- if err.Error() == "exit status 1" {`
	`498`	`+ if strings.Contains(err.Error(), "exit status 1") {`
`499`	`499`	`return nil, nil`
`500`	`500`	`}`
`501`	`501`	`return nil, fmt.Errorf("git merge-base --is-ancestor: %v %v", stderr, err)`