Nemcio/Gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2026-05-09 00:36:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Unknwon
2017-06-05 13:35:13 -04:00
parent 2155ef0208
commit 3359b942b3
2 changed files with 4 additions and 4 deletions
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