gitea

Commit Graph

Author	SHA1	Message	Date
TheFox0x7	ae3a18e01a	Remove context from git struct (#33793 ) Argument is moved from struct init in command run, which lets us remove context from struct.	4 weeks ago
Chongyi Zheng	e80466f734	Resolve lint for unused parameter and unnecessary type arguments (#30750 ) Resolve all cases for `unused parameter` and `unnecessary type arguments` Related: #30729 --------- Co-authored-by: Giteabot <teabot@gitea.io>	11 months ago
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

Author

SHA1

Message

Date

TheFox0x7

ae3a18e01a

Remove context from git struct (#33793 )

Argument is moved from struct init in command run, which lets us remove
context from struct.

Chongyi Zheng

e80466f734

Resolve lint for unused parameter and unnecessary type arguments (#30750 )

Resolve all cases for `unused parameter` and `unnecessary type
arguments`

Related: #30729

---------

Co-authored-by: Giteabot <teabot@gitea.io>

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>

3 Commits (b8c2afdc5fda830c85586988a49d47678ba0ea98)