Git with a cup of tea, painless self-hosted git service

hacktoberfest go golang git devops gitea gogs github gitlab

Lunny Xiao 1463426a27 Use merge tree to detect conflicts when possible (#36400 ) In Git 2.38, the `merge-tree` command introduced the `--write-tree` option, which works directly on bare repositories. In Git 2.40, a new parameter `--merge-base` introduced so we require Git 2.40 to use the merge tree feature. This option produces the merged tree object ID, allowing us to perform diffs between commits without creating a temporary repository. By avoiding the overhead of setting up and tearing down temporary repos, this approach delivers a notable performance improvement. It also fixes a possible situation that conflict files might be empty but it's a conflict status according to https://git-scm.com/docs/git-merge-tree#_mistakes_to_avoid Replace #35542 --------- Signed-off-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>		1 week ago
..
attribute	Refactor git command stdio pipe (#36422 )	2 weeks ago
foreachref	Allow foreachref parse max tokens from 4*64KB to 4MB (#36414 )	2 weeks ago
gitcmd	Use merge tree to detect conflicts when possible (#36400 )	1 week ago
internal	Refactor git command package to improve security and maintainability (#22678 )	3 years ago
languagestats	Refactor cat-file batch operations and support `--batch-command` approach (#35775 )	4 weeks ago
pipeline	Refactor git command stdio pipe (#36422 )	2 weeks ago
tests/repos	Refactor Git Attribute & performance optimization (#34154 )	10 months ago
url	Upgrade to go 1.25.3 (#35656 )	4 months ago
README.md	…
blob.go	Add support for 3D/CAD file formats preview (#34794 )	7 months ago
blob_gogit.go	Fix panic when get editor config file (#36241 )	1 month ago
blob_nogogit.go	Refactor cat-file batch operations and support `--batch-command` approach (#35775 )	4 weeks ago
blob_test.go	Remove wrong "git.DefaultContext" (#35364 )	5 months ago
catfile_batch.go	Refactor cat-file batch operations and support `--batch-command` approach (#35775 )	4 weeks ago
catfile_batch_command.go	Refactor git command stdio pipe (#36422 )	2 weeks ago
catfile_batch_legacy.go	Refactor git command stdio pipe (#36422 )	2 weeks ago
catfile_batch_reader.go	Refactor git command stdio pipe (#36422 )	2 weeks ago
catfile_batch_test.go	Refactor git command stdio pipe (#36422 )	2 weeks ago
cmdverb.go	Fix a bug when uploading file via lfs ssh command (#34408 )	9 months ago
commit.go	Refactor git command stderr handling (#36402 )	2 weeks ago
commit_convert_gogit.go	Refactor commit signature parser (#30228 )	2 years ago
commit_info.go	Fix repo file list partial reloading for submodules (#35183 )	6 months ago
commit_info_gogit.go	Fix repo file list partial reloading for submodules (#35183 )	6 months ago
commit_info_nogogit.go	Fix repo file list partial reloading for submodules (#35183 )	6 months ago
commit_info_test.go	Refactor cat-file batch operations and support `--batch-command` approach (#35775 )	4 weeks ago
commit_reader.go	Refactor commit reader (#34542 )	8 months ago
commit_sha256_test.go	Move commit related functions to gitrepo package (#35600 )	2 months ago
commit_submodule.go	Fix submodule nil check (#35096 )	7 months ago
commit_submodule_file.go	Fix various bugs (#35177 )	6 months ago
commit_submodule_file_test.go	Fix various bugs (#35177 )	6 months ago
commit_test.go	Move commit related functions to gitrepo package (#35600 )	2 months ago
config.go	Move some functions to gitrepo package (#35543 )	4 months ago
config_submodule.go	Fix submodule parsing (#32571 )	1 year ago
config_submodule_test.go	Fix submodule parsing (#32571 )	1 year ago
config_test.go	Move git command to git/gitcmd (#35483 )	5 months ago
diff.go	Refactor GetRepoRawDiffForFile to avoid unnecessary pipe or goroutine (#36434 )	2 weeks ago
diff_test.go	Run `gopls modernize` on codebase (#34751 )	8 months ago
error.go	Refactor git command context & pipeline (#36406 )	2 weeks ago
git.go	Use merge tree to detect conflicts when possible (#36400 )	1 week ago
git_test.go	Refactor cat-file batch operations and support `--batch-command` approach (#35775 )	4 weeks ago
gpg.go	Remove undocumented support of signing key in the repository git configuration file (#36143 )	2 months ago
grep.go	Use merge tree to detect conflicts when possible (#36400 )	1 week ago
grep_test.go	Remove wrong "git.DefaultContext" (#35364 )	5 months ago
hook.go	Refactor legacy code (#35708 )	4 months ago
key.go	Remove undocumented support of signing key in the repository git configuration file (#36143 )	2 months ago
last_commit_cache.go	Run `gopls modernize` on codebase (#34751 )	8 months ago
last_commit_cache_gogit.go	Abstract hash function usage (#28138 )	2 years ago
last_commit_cache_nogogit.go	Implement FSFE REUSE for golang files (#21840 )	3 years ago
log_name_status.go	Refactor git command stdio pipe (#36422 )	2 weeks ago
notes.go	Implement FSFE REUSE for golang files (#21840 )	3 years ago
notes_gogit.go	Refactor ls-tree and git path related problems (#35858 )	3 months ago
notes_nogogit.go	Implement FSFE REUSE for golang files (#21840 )	3 years ago
notes_test.go	Update dependencies (#35733 )	3 months ago
object_format.go	Make sure git version&feature are always prepared (#30877 )	2 years ago
object_id.go	Enable addtional linters (#34085 )	10 months ago
object_id_gogit.go	Add support for sha256 repositories (#23894 )	2 years ago
object_id_test.go	Fix incorrect object id hash function (#30708 )	2 years ago
parse.go	Improve diff file headers (#36215 )	3 weeks ago
parse_treeentry.go	Refactor cat-file batch operations and support `--batch-command` approach (#35775 )	4 weeks ago
parse_treeentry_test.go	Refactor ls-tree and git path related problems (#35858 )	3 months ago
ref.go	improve the compare page (#36261 )	1 month ago
ref_test.go	Refactor RefName (#33234 )	1 year ago
remote.go	Refactor git command context & pipeline (#36406 )	2 weeks ago
repo.go	Refactor git command stderr handling (#36402 )	2 weeks ago
repo_base_gogit.go	Remove undocumented support of signing key in the repository git configuration file (#36143 )	2 months ago
repo_base_nogogit.go	Refactor cat-file batch operations and support `--batch-command` approach (#35775 )	4 weeks ago
repo_base_nogogit_test.go	Refactor cat-file batch operations and support `--batch-command` approach (#35775 )	4 weeks ago
repo_blob.go	Fix panic when get editor config file (#36241 )	1 month ago
repo_blob_test.go	Remove wrong "git.DefaultContext" (#35364 )	5 months ago
repo_branch.go	Move some functions to gitrepo package (#35543 )	4 months ago
repo_branch_gogit.go	Fix typo in documentation of GetBranchNames() (#33330 )	1 year ago
repo_branch_nogogit.go	Use merge tree to detect conflicts when possible (#36400 )	1 week ago
repo_branch_test.go	Remove wrong "git.DefaultContext" (#35364 )	5 months ago
repo_commit.go	Refactor git command stdio pipe (#36422 )	2 weeks ago
repo_commit_gogit.go	Refactor git command stdio pipe (#36393 )	2 weeks ago
repo_commit_nogogit.go	Refactor git command stdio pipe (#36393 )	2 weeks ago
repo_commit_test.go	Remove wrong "git.DefaultContext" (#35364 )	5 months ago
repo_commitgraph.go	Move some functions to gitrepo package (#35543 )	4 months ago
repo_commitgraph_gogit.go	Use filepath.Join instead of path.Join for file system file operations (#33978 )	11 months ago
repo_compare.go	Refactor git command stdio pipe (#36422 )	2 weeks ago
repo_compare_test.go	Move some functions to gitrepo package (#35543 )	4 months ago
repo_hook.go	Implement FSFE REUSE for golang files (#21840 )	3 years ago
repo_index.go	Refactor git command stdio pipe (#36422 )	2 weeks ago
repo_object.go	Refactor git command stdio pipe (#36422 )	2 weeks ago
repo_ref.go	Move some functions to gitrepo package (#35543 )	4 months ago
repo_ref_gogit.go	Abstract hash function usage (#28138 )	2 years ago
repo_ref_nogogit.go	Refactor git command stdio pipe (#36422 )	2 weeks ago
repo_ref_test.go	Remove wrong "git.DefaultContext" (#35364 )	5 months ago
repo_stats.go	Refactor git command stdio pipe (#36422 )	2 weeks ago
repo_stats_test.go	Remove wrong "git.DefaultContext" (#35364 )	5 months ago
repo_tag.go	Refactor git command stdio pipe (#36422 )	2 weeks ago
repo_tag_gogit.go	Remove the duplicated function GetTags (#35375 )	5 months ago
repo_tag_nogogit.go	Refactor cat-file batch operations and support `--batch-command` approach (#35775 )	4 weeks ago
repo_tag_test.go	Remove the duplicated function GetTags (#35375 )	5 months ago
repo_test.go	Move some functions to gitrepo package to reduce RepoPath reference directly (#36126 )	2 months ago
repo_tree.go	Refactor git command stdio pipe (#36422 )	2 weeks ago
repo_tree_gogit.go	Refactor ls-tree and git path related problems (#35858 )	3 months ago
repo_tree_nogogit.go	Refactor cat-file batch operations and support `--batch-command` approach (#35775 )	4 weeks ago
signature.go	Refactor parseSignatureFromCommitLine (#29054 )	2 years ago
signature_gogit.go	Refactor parseSignatureFromCommitLine (#29054 )	2 years ago
signature_nogogit.go	Refactor parseSignatureFromCommitLine (#29054 )	2 years ago
signature_test.go	Enable testifylint rules (#34075 )	10 months ago
submodule.go	Refactor git command stdio pipe (#36422 )	2 weeks ago
submodule_test.go	Move some functions to gitrepo package (#35543 )	4 months ago
tag.go	Avoid creating unnecessary temporary cat file sub process (#33942 )	10 months ago
tag_test.go	Refactor commit signature parser (#30228 )	2 years ago
tree.go	Refactor ls-tree and git path related problems (#35858 )	3 months ago
tree_blob.go	Implement FSFE REUSE for golang files (#21840 )	3 years ago
tree_blob_gogit.go	Refactor ls-tree and git path related problems (#35858 )	3 months ago
tree_blob_nogogit.go	Follow file symlinks in the UI to their target (#28835 )	7 months ago
tree_entry.go	Refactor ls-tree and git path related problems (#35858 )	3 months ago
tree_entry_common_test.go	Remove wrong "git.DefaultContext" (#35364 )	5 months ago
tree_entry_gogit.go	Fix panic when get editor config file (#36241 )	1 month ago
tree_entry_gogit_test.go	Refactor ls-tree and git path related problems (#35858 )	3 months ago
tree_entry_mode.go	Improve diff file headers (#36215 )	3 weeks ago
tree_entry_nogogit.go	Refactor cat-file batch operations and support `--batch-command` approach (#35775 )	4 weeks ago
tree_entry_test.go	Support rendering OpenAPI spec (#36449 )	1 week ago
tree_gogit.go	Refactor ls-tree and git path related problems (#35858 )	3 months ago
tree_nogogit.go	Refactor cat-file batch operations and support `--batch-command` approach (#35775 )	4 weeks ago
tree_test.go	Remove wrong "git.DefaultContext" (#35364 )	5 months ago
utils.go	fix attachment file size limit in server backend (#35519 )	4 months ago
utils_test.go	Fix various bugs (#35177 )	6 months 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.