diff options
Diffstat (limited to 'vendor/github.com/gogits/git-module/repo_pull.go')
| -rw-r--r-- | vendor/github.com/gogits/git-module/repo_pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/github.com/gogits/git-module/repo_pull.go b/vendor/github.com/gogits/git-module/repo_pull.go index 76efa6f4..22ccb269 100644 --- a/vendor/github.com/gogits/git-module/repo_pull.go +++ b/vendor/github.com/gogits/git-module/repo_pull.go @@ -23,7 +23,7 @@ type PullRequestInfo struct { func (repo *Repository) GetMergeBase(base, head string) (string, error) { stdout, err := NewCommand("merge-base", base, head).RunInDir(repo.Path) if err != nil { - if strings.HasSuffix(err.Error(), " 1") { + if strings.Contains(err.Error(), "exit status 1") { return "", ErrNoMergeBase{} } return "", err |