mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-09-08 00:03:28 +00:00
Fix exit status 1 not handled @ getMergeCommit
This commit is contained in:
parent
783b1967e2
commit
b36849dc1f
1 changed files with 1 additions and 1 deletions
|
@ -495,7 +495,7 @@ func (pr *PullRequest) getMergeCommit() (*git.Commit, error) {
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// Errors are signaled by a non-zero status that is not 1
|
// 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, nil
|
||||||
}
|
}
|
||||||
return nil, fmt.Errorf("git merge-base --is-ancestor: %v %v", stderr, err)
|
return nil, fmt.Errorf("git merge-base --is-ancestor: %v %v", stderr, err)
|
||||||
|
|
Loading…
Reference in a new issue