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.	2025-03-04 11:56:11 -08:00
Chris Copeland	47b5965862	Add merge style `fast-forward-only` (#28954 ) With this option, it is possible to require a linear commit history with the following benefits over the next best option `Rebase+fast-forward`: The original commits continue existing, with the original signatures continuing to stay valid instead of being rewritten, there is no merge commit, and reverting commits becomes easier. Closes #24906	2024-02-12 23:37:23 +01:00
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>	2023-03-07 15:07:35 -05:00

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.

2025-03-04 11:56:11 -08:00

Chris Copeland

47b5965862

Add merge style `fast-forward-only` (#28954 )

With this option, it is possible to require a linear commit history with
the following benefits over the next best option `Rebase+fast-forward`:
The original commits continue existing, with the original signatures
continuing to stay valid instead of being rewritten, there is no merge
commit, and reverting commits becomes easier.

Closes #24906

2024-02-12 23:37:23 +01:00

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>

2023-03-07 15:07:35 -05:00

3 Commits (08a7e65c84d6612b73b3c930fdeaa31a43b685e0)