From 3359b942b379bdfb7ae33b8c106c8b3bc8afbf52 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Mon, 5 Jun 2017 13:35:13 -0400 Subject: vendor: update github.com/gogits/git-module --- vendor/github.com/gogits/git-module/repo_pull.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vendor/github.com/gogits/git-module/repo_pull.go') 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 -- cgit v1.2.3