You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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>
1 year ago
..
foreachref Implement FSFE REUSE for golang files (#21840) 2 years ago
internal Refactor git command package to improve security and maintainability (#22678) 1 year ago
pipeline Refactor and tidy-up the merge/update branch code (#22568) 1 year ago
tests/repos Fix commit retrieval by tag (#21804) 1 year ago
url Implement FSFE REUSE for golang files (#21840) 2 years ago
README.md move code.gitea.io/git to code.gitea.io/gitea/modules/git (#6364) 5 years ago
batch_reader.go Implement FSFE REUSE for golang files (#21840) 2 years ago
blame.go Fix blame view missing lines (#22826) 1 year ago
blame_test.go Fix blame view missing lines (#22826) 1 year ago
blob.go Implement FSFE REUSE for golang files (#21840) 2 years ago
blob_gogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
blob_nogogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
blob_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
command.go Refactor git command package to improve security and maintainability (#22678) 1 year ago
command_race_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
command_test.go Refactor git command package to improve security and maintainability (#22678) 1 year ago
commit.go Use `--message=%s` for git commit message (#23028) 1 year ago
commit_convert_gogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
commit_info.go Implement FSFE REUSE for golang files (#21840) 2 years ago
commit_info_gogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
commit_info_nogogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
commit_info_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
commit_reader.go Implement FSFE REUSE for golang files (#21840) 2 years ago
commit_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
diff.go Implement FSFE REUSE for golang files (#21840) 2 years ago
diff_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
error.go Implement FSFE REUSE for golang files (#21840) 2 years ago
git.go Pass `--global` when calling `git config --get`, for consistency with `git config --set` (#23157) 1 year ago
git_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
hook.go Implement FSFE REUSE for golang files (#21840) 2 years ago
last_commit_cache.go Use minio/sha256-simd for accelerated SHA256 (#23052) 1 year ago
last_commit_cache_gogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
last_commit_cache_nogogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
log_name_status.go Implement FSFE REUSE for golang files (#21840) 2 years ago
notes.go Implement FSFE REUSE for golang files (#21840) 2 years ago
notes_gogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
notes_nogogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
notes_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
parse_gogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
parse_gogit_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
parse_nogogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
parse_nogogit_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
ref.go Util type to parse ref name (#21969) 2 years ago
remote.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo.go Use proxy for pull mirror (#22771) 1 year ago
repo_archive.go Refactor git command package to improve security and maintainability (#22678) 1 year ago
repo_attribute.go Refactor legacy strange git operations (#22756) 1 year ago
repo_attribute_test.go Remove deadcode (#22245) 2 years ago
repo_base.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_base_gogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_base_nogogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_blame.go Refactor git command package to improve security and maintainability (#22678) 1 year ago
repo_blob.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_blob_gogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_blob_nogogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_blob_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_branch.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_branch_gogit.go Refactor git command package to improve security and maintainability (#22678) 1 year ago
repo_branch_nogogit.go Refactor git command package to improve security and maintainability (#22678) 1 year ago
repo_branch_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_commit.go Refactor git command package to improve security and maintainability (#22678) 1 year ago
repo_commit_gogit.go Fix commit retrieval by tag (#21804) 1 year ago
repo_commit_nogogit.go Fix commit retrieval by tag (#21804) 1 year ago
repo_commit_test.go Fix commit retrieval by tag (#21804) 1 year ago
repo_commitgraph.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_commitgraph_gogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_compare.go Fix GetFilesChangedBetween if the file name may be escaped (#23272) 1 year ago
repo_compare_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_gpg.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_hook.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_index.go Use complete SHA to create and query commit status (#22244) 2 years ago
repo_language_stats.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_language_stats_gogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_language_stats_nogogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_language_stats_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_object.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_ref.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_ref_gogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_ref_nogogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_ref_test.go Fix commit retrieval by tag (#21804) 1 year ago
repo_stats.go Refactor git command package to improve security and maintainability (#22678) 1 year ago
repo_stats_test.go Fix commit retrieval by tag (#21804) 1 year ago
repo_tag.go Refactor git command package to improve security and maintainability (#22678) 1 year ago
repo_tag_gogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
repo_tag_nogogit.go Refactor git command package to improve security and maintainability (#22678) 1 year ago
repo_tag_test.go Fix commit retrieval by tag (#21804) 1 year ago
repo_test.go Fix commit retrieval by tag (#21804) 1 year ago
repo_tree.go Refactor git command package to improve security and maintainability (#22678) 1 year ago
repo_tree_gogit.go Use complete SHA to create and query commit status (#22244) 2 years ago
repo_tree_nogogit.go Use complete SHA to create and query commit status (#22244) 2 years ago
sha1.go Use complete SHA to create and query commit status (#22244) 2 years ago
sha1_gogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
sha1_nogogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
sha1_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
signature.go Implement FSFE REUSE for golang files (#21840) 2 years ago
signature_gogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
signature_nogogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
submodule.go Implement FSFE REUSE for golang files (#21840) 2 years ago
submodule_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
tag.go Implement FSFE REUSE for golang files (#21840) 2 years ago
tag_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
tree.go Implement FSFE REUSE for golang files (#21840) 2 years ago
tree_blob.go Implement FSFE REUSE for golang files (#21840) 2 years ago
tree_blob_gogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
tree_blob_nogogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
tree_entry.go Remember to attach the parent tree when converting TreeEntry() -> Tree() (#22902) 1 year ago
tree_entry_gogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
tree_entry_mode.go Implement FSFE REUSE for golang files (#21840) 2 years ago
tree_entry_nogogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
tree_entry_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
tree_gogit.go Implement FSFE REUSE for golang files (#21840) 2 years ago
tree_nogogit.go Refactor git command package to improve security and maintainability (#22678) 1 year ago
utils.go Implement FSFE REUSE for golang files (#21840) 2 years ago
utils_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago

README.md

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.