Browse Source

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

Unknwon 7 years ago
parent
commit
3359b942b3
2 changed files with 4 additions and 4 deletions
  1. 1 1
      vendor/github.com/gogits/git-module/repo_pull.go
  2. 3 3
      vendor/vendor.json

+ 1 - 1
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

+ 3 - 3
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=",