Merge pull request #2087 from Bwko/fix_error_exit

Fix exit status 1 not handled @ getMergeCommit (#2087)
tokarchuk/v1.17
Lauris BH 8 years ago committed by GitHub
commit 12cb6cd3c9
  1. 2
      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)

Loading…
Cancel
Save