diff options
| author | Bwko <bouwko@gmail.com> | 2017-06-30 12:29:58 +0200 |
|---|---|---|
| committer | Bwko <bouwko@gmail.com> | 2017-06-30 12:35:26 +0200 |
| commit | b36849dc1f8df55bba9c3ad77993c7d521776842 (patch) | |
| tree | 88217a20eff83ea77d128a9e9f3b5eab52b18e1e | |
| parent | 783b1967e257fdba2bd593d9f2108da2010b7448 (diff) | |
| download | gitea-b36849dc1f8df55bba9c3ad77993c7d521776842.tar.gz gitea-b36849dc1f8df55bba9c3ad77993c7d521776842.zip | |
Fix exit status 1 not handled @ getMergeCommit
| -rw-r--r-- | models/pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/models/pull.go b/models/pull.go index 94bd7930ff..1db0a89741 100644 --- 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) |