0
0
mirror of https://github.com/go-gitea/gitea.git synced 2025-01-19 09:06:20 +01:00
gitea/modules/git
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
..
foreachref
internal
pipeline Refactor and tidy-up the merge/update branch code (#22568) 2023-03-07 15:07:35 -05:00
tests/repos
url
batch_reader.go
blame_test.go
blame.go
blob_gogit.go
blob_nogogit.go
blob_test.go
blob.go
command_race_test.go
command_test.go
command.go
commit_convert_gogit.go
commit_info_gogit.go
commit_info_nogogit.go
commit_info_test.go
commit_info.go
commit_reader.go
commit_test.go
commit.go
diff_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
diff.go
error.go
git_test.go
git.go
hook.go
last_commit_cache_gogit.go
last_commit_cache_nogogit.go
last_commit_cache.go
log_name_status.go
notes_gogit.go
notes_nogogit.go
notes_test.go
notes.go
parse_gogit_test.go
parse_gogit.go
parse_nogogit_test.go
parse_nogogit.go
README.md
ref.go
remote.go
repo_archive.go
repo_attribute_test.go
repo_attribute.go
repo_base_gogit.go
repo_base_nogogit.go
repo_base.go
repo_blame.go
repo_blob_gogit.go
repo_blob_nogogit.go
repo_blob_test.go
repo_blob.go
repo_branch_gogit.go
repo_branch_nogogit.go
repo_branch_test.go
repo_branch.go
repo_commit_gogit.go
repo_commit_nogogit.go
repo_commit_test.go
repo_commit.go
repo_commitgraph_gogit.go
repo_commitgraph.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
repo_compare_test.go
repo_compare.go
repo_gpg.go
repo_hook.go
repo_index.go
repo_language_stats_gogit.go
repo_language_stats_nogogit.go
repo_language_stats_test.go
repo_language_stats.go
repo_object.go
repo_ref_gogit.go
repo_ref_nogogit.go
repo_ref_test.go
repo_ref.go
repo_stats_test.go
repo_stats.go
repo_tag_gogit.go
repo_tag_nogogit.go
repo_tag_test.go
repo_tag.go
repo_test.go
repo_tree_gogit.go
repo_tree_nogogit.go
repo_tree.go
repo.go
sha1_gogit.go
sha1_nogogit.go
sha1_test.go
sha1.go
signature_gogit.go
signature_nogogit.go
signature.go
submodule_test.go
submodule.go
tag_test.go
tag.go
tree_blob_gogit.go
tree_blob_nogogit.go
tree_blob.go
tree_entry_gogit.go
tree_entry_mode.go
tree_entry_nogogit.go
tree_entry_test.go
tree_entry.go
tree_gogit.go
tree_nogogit.go
tree.go
utils_test.go
utils.go

Git Module

This module is merged from https://github.com/go-gitea/git which is a Go module to access Git through shell commands. Now it's a part of gitea's main repository for easier pull request.