github.com/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-11-10 17:25:54 +01:00
Code Releases Wiki Activity

Fix exit status 1 not handled @ getMergeCommit

Browse Source
This commit is contained in:
Bwko 2017-06-30 12:29:58 +02:00
parent 783b1967e2
commit b36849dc1f
No known key found for this signature in database
GPG Key ID: 432CCC0818CB741D
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/pull.go
View File

@ -495,7 +495,7 @@ func (pr *PullRequest) getMergeCommit() (*git.Commit, error) {
if err != nil {
// Errors are signaled by a non-zero status that is not 1
if err.Error() == "exit status 1" {
if strings.Contains(err.Error(), "exit status 1") {
return nil, nil
}
return nil, fmt.Errorf("git merge-base --is-ancestor: %v %v", stderr, err)