diff options
| author | zeripath <art27@cantab.net> | 2022-01-18 23:26:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 00:26:42 +0100 |
| commit | 4a20eadfd7ecc1e71a02f5c96d6f92d9818b0a28 (patch) | |
| tree | 70036ae56df85fdbd9c0010573fd2b1f0eae212d /services/pull/merge.go | |
| parent | 84f8ef3df6316cb8fe8048556288452c07da4d7b (diff) | |
| download | gitea-4a20eadfd7ecc1e71a02f5c96d6f92d9818b0a28.tar.gz gitea-4a20eadfd7ecc1e71a02f5c96d6f92d9818b0a28.zip | |
Restore propagation of ErrDependenciesLeft (#18325)
Unfortunately #17643 prevented all propagation of ErrDependenciesLeft meaning
that dependency errors that prevent closing of issues get swallowed.
This PR restores propagation of the error but instead swallows the error in the
places where it needs to be swallowed.
Fix #18223
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'services/pull/merge.go')
| -rw-r--r-- | services/pull/merge.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/pull/merge.go b/services/pull/merge.go index 34cab2fd71..f6a6415bff 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -105,7 +105,10 @@ func Merge(pr *models.PullRequest, doer *user_model.User, baseGitRepo *git.Repos close := ref.RefAction == references.XRefActionCloses if close != ref.Issue.IsClosed { if err = issue_service.ChangeStatus(ref.Issue, doer, close); err != nil { - return err + // Allow ErrDependenciesLeft + if !models.IsErrDependenciesLeft(err) { + return err + } } } } |