diff options
| author | Unknwon <u@gogs.io> | 2017-06-05 13:35:13 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2017-06-05 13:35:13 -0400 |
| commit | 3359b942b379bdfb7ae33b8c106c8b3bc8afbf52 (patch) | |
| tree | 9850ea289ccae50c10c82f173b5e2bfd9adb84ea /vendor | |
| parent | 2155ef02081218f922742d0d65f894b787fed890 (diff) | |
vendor: update github.com/gogits/git-module
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/gogits/git-module/repo_pull.go | 2 | ||||
| -rw-r--r-- | vendor/vendor.json | 6 |
2 files changed, 4 insertions, 4 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 diff --git a/vendor/vendor.json b/vendor/vendor.json index ea8796db..60197a07 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -183,10 +183,10 @@ "revisionTime": "2016-08-10T03:50:02Z" }, { - "checksumSHA1": "2qWMpRKKvKlGx6QlgyAWpsohrZc=", + "checksumSHA1": "SZuq+ZMDc6aRw7DuR2sfotbYBeA=", "path": "github.com/gogits/git-module", - "revision": "29022edafc5bd803251256f7f4bd63a0cb4b162f", - "revisionTime": "2017-06-05T04:08:00Z" + "revision": "6ad215295b08e552871b8ed57bb0d57940cbf1b6", + "revisionTime": "2017-06-05T17:33:32Z" }, { "checksumSHA1": "GBfb+meRaVNarQavLB/bzbDoBtY=", |