Browse Source

vendor: update github.com/gogits/git-module

pull/4549/head
Unknwon 8 years ago
parent
commit
3359b942b3
No known key found for this signature in database
GPG Key ID: 7A02C406FAC875A2
  1. 2
      vendor/github.com/gogits/git-module/repo_pull.go
  2. 6
      vendor/vendor.json

2
vendor/github.com/gogits/git-module/repo_pull.go generated vendored

@ -23,7 +23,7 @@ type PullRequestInfo struct {
func (repo *Repository) GetMergeBase(base, head string) (string, error) { func (repo *Repository) GetMergeBase(base, head string) (string, error) {
stdout, err := NewCommand("merge-base", base, head).RunInDir(repo.Path) stdout, err := NewCommand("merge-base", base, head).RunInDir(repo.Path)
if err != nil { if err != nil {
if strings.HasSuffix(err.Error(), " 1") { if strings.Contains(err.Error(), "exit status 1") {
return "", ErrNoMergeBase{} return "", ErrNoMergeBase{}
} }
return "", err return "", err

6
vendor/vendor.json vendored

@ -183,10 +183,10 @@
"revisionTime": "2016-08-10T03:50:02Z" "revisionTime": "2016-08-10T03:50:02Z"
}, },
{ {
"checksumSHA1": "2qWMpRKKvKlGx6QlgyAWpsohrZc=", "checksumSHA1": "SZuq+ZMDc6aRw7DuR2sfotbYBeA=",
"path": "github.com/gogits/git-module", "path": "github.com/gogits/git-module",
"revision": "29022edafc5bd803251256f7f4bd63a0cb4b162f", "revision": "6ad215295b08e552871b8ed57bb0d57940cbf1b6",
"revisionTime": "2017-06-05T04:08:00Z" "revisionTime": "2017-06-05T17:33:32Z"
}, },
{ {
"checksumSHA1": "GBfb+meRaVNarQavLB/bzbDoBtY=", "checksumSHA1": "GBfb+meRaVNarQavLB/bzbDoBtY=",

Loading…
Cancel
Save