Commits on Mar 7, 2023

1. Refactor and tidy-up the merge/update branch code (go-gitea#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>

   

   

   3 people authored and GiteaBot committed Mar 7, 2023
   Configuration menu

   • View commit details
   • Copy full SHA for c7c9375
   • Browse repository at this point

   Copy the full SHA

   c7c9375 View commit details

   Browse the repository at this point in the history