0
0
mirror of https://github.com/go-gitea/gitea.git synced 2024-11-28 21:26:25 +01:00
gitea/services/pull
zeripath 4a20eadfd7
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>
2022-01-19 00:26:42 +01:00
..
check_test.go
check.go
commit_status.go
lfs.go
main_test.go
merge.go Restore propagation of ErrDependenciesLeft (#18325) 2022-01-19 00:26:42 +01:00
patch_unmerged.go Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004) 2021-12-19 05:19:25 +01:00
patch.go Reset the conflicted files list in testpatch (#18139) 2021-12-31 20:33:55 +08:00
pull_test.go
pull.go Restore propagation of ErrDependenciesLeft (#18325) 2022-01-19 00:26:42 +01:00
review.go Simplify parameter types (#18006) 2021-12-20 04:41:31 +00:00
temp_repo.go
update.go Abort merge if head has been updated before pressing merge (#18032) 2021-12-20 08:32:54 +08:00