You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

zeripath 8598356df1 Refactor and tidy-up the merge/update branch code (#22568) ... The merge and update branch code was previously a little tangled and had some very long functions. The functions were not very clear in their reasoning and there were deficiencies in their logging and at least one bug in the handling of LFS for update by rebase. This PR substantially refactors this code and splits things out to into separate functions. It also attempts to tidy up the calls by wrapping things in "context"s. There are also attempts to improve logging when there are errors. Signed-off-by: Andrew Thornton <art27@cantab.net> --------- Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: delvh <dev.lh@web.de>		2 years ago
..
check.go	Add force_merge to merge request and fix checking mergable (#23010)	2 years ago
check_test.go	Implement FSFE REUSE for golang files (#21840)	2 years ago
comment.go	Rename almost all Ctx functions (#22071)	2 years ago
commit_status.go	Supports wildcard protected branch (#20825)	2 years ago
edits.go	Implement FSFE REUSE for golang files (#21840)	2 years ago
lfs.go	Refactor and tidy-up the merge/update branch code (#22568)	2 years ago
main_test.go	Implement FSFE REUSE for golang files (#21840)	2 years ago
merge.go	Refactor and tidy-up the merge/update branch code (#22568)	2 years ago
merge_merge.go	Refactor and tidy-up the merge/update branch code (#22568)	2 years ago
merge_prepare.go	Refactor and tidy-up the merge/update branch code (#22568)	2 years ago
merge_rebase.go	Refactor and tidy-up the merge/update branch code (#22568)	2 years ago
merge_squash.go	Refactor and tidy-up the merge/update branch code (#22568)	2 years ago
merge_test.go	Support template for merge message description (#22248)	2 years ago
patch.go	Refactor and tidy-up the merge/update branch code (#22568)	2 years ago
patch_unmerged.go	Implement FSFE REUSE for golang files (#21840)	2 years ago
pull.go	Refactor and tidy-up the merge/update branch code (#22568)	2 years ago
pull_test.go	Support template for merge message description (#22248)	2 years ago
review.go	Make Ctrl+Enter submit a pending comment (starting review) instead of submitting a single comment (#23245)	2 years ago
temp_repo.go	Refactor and tidy-up the merge/update branch code (#22568)	2 years ago
update.go	Refactor and tidy-up the merge/update branch code (#22568)	2 years ago
update_rebase.go	Refactor and tidy-up the merge/update branch code (#22568)	2 years ago