2 Commits (420d015b76a49e1018c3f1b73ce3b9f72d86f78c)

Author	SHA1	Message	Date
wxiaoguang	09824025f7	Refactor merge/update git command calls (#23366) (#23544) ... Backport #23366 * Remove unnecessary ToTrustedCmdArgs calls * The `signArg` couldn't be empty, it's either `-S{keyID}` or `--no-gpg-sign`.	2 years ago
Giteabot	e9991b1f06	Refactor and tidy-up the merge/update branch code (#22568) (#23365) ... Backport #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: zeripath <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: delvh <dev.lh@web.de>	2 years ago