USEFULL
/
gogs
mirror of https://github.com/gogs/gogs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

pull/4549/head
Unknwon 2017-06-05 13:35:13 -04:00
parent 2155ef0208
commit 3359b942b3
No known key found for this signature in database
GPG Key ID: 7A02C406FAC875A2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

6
vendor/vendor.json vendored
View File

@ -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=",