diff options
| author | Lauris BH <lauris@nix.lv> | 2017-06-30 15:46:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-30 15:46:49 +0300 |
| commit | 12cb6cd3c9b729e7d0c7983a8d8597a89498f307 (patch) | |
| tree | 2557539b4b434c22729f6556590918d80cea64da /models | |
| parent | 8fd43f215c72ecfd175b4bae3ffb0b5e16170e6e (diff) | |
| parent | b36849dc1f8df55bba9c3ad77993c7d521776842 (diff) | |
| download | gitea-12cb6cd3c9b729e7d0c7983a8d8597a89498f307.tar.gz gitea-12cb6cd3c9b729e7d0c7983a8d8597a89498f307.zip | |
Merge pull request #2087 from Bwko/fix_error_exit
Fix exit status 1 not handled @ getMergeCommit (#2087)
Diffstat (limited to 'models')
| -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) |