mirror of https://github.com/go-gitea/gitea.git synced 2026-02-03 04:46:43 +01:00

History

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>

2026-01-27 11:57:20 -08:00

attribute

Refactor git command stdio pipe (#36422 )

2026-01-22 06:04:26 +00:00

foreachref

Allow foreachref parse max tokens from 4*64KB to 4MB (#36414 )

2026-01-21 04:18:57 +00:00

gitcmd

Use merge tree to detect conflicts when possible (#36400 )

2026-01-27 11:57:20 -08:00

internal

Refactor git command package to improve security and maintainability (#22678 )

2023-02-04 10:30:43 +08:00

languagestats

Refactor cat-file batch operations and support --batch-command approach (#35775 )

2026-01-08 13:37:36 -08:00

pipeline

Refactor git command stdio pipe (#36422 )

2026-01-22 06:04:26 +00:00

tests/repos

Refactor Git Attribute & performance optimization (#34154 )

2025-04-11 21:41:29 +08:00

url

Upgrade to go 1.25.3 (#35656 )

2025-10-15 10:09:32 +02:00

blob_gogit.go

Fix panic when get editor config file (#36241 )

2025-12-25 19:26:23 -08:00

blob_nogogit.go

Refactor cat-file batch operations and support --batch-command approach (#35775 )

2026-01-08 13:37:36 -08:00

blob_test.go

Remove wrong "git.DefaultContext" (#35364 )

2025-08-27 16:31:21 +00:00

blob.go

Add support for 3D/CAD file formats preview (#34794 )

2025-06-30 16:12:25 +08:00

catfile_batch_command.go

Refactor git command stdio pipe (#36422 )

2026-01-22 06:04:26 +00:00

catfile_batch_legacy.go

Refactor git command stdio pipe (#36422 )

2026-01-22 06:04:26 +00:00

catfile_batch_reader.go

Refactor git command stdio pipe (#36422 )

2026-01-22 06:04:26 +00:00

catfile_batch_test.go

Refactor git command stdio pipe (#36422 )

2026-01-22 06:04:26 +00:00

catfile_batch.go

Refactor cat-file batch operations and support --batch-command approach (#35775 )

2026-01-08 13:37:36 -08:00

cmdverb.go

Fix a bug when uploading file via lfs ssh command (#34408 )

2025-05-09 16:17:08 +00:00

commit_convert_gogit.go

Refactor commit signature parser (#30228 )

2024-04-01 20:23:17 +00:00

commit_info_gogit.go

Fix repo file list partial reloading for submodules (#35183 )

2025-07-31 09:34:51 +08:00

commit_info_nogogit.go

Fix repo file list partial reloading for submodules (#35183 )

2025-07-31 09:34:51 +08:00

commit_info_test.go

Refactor cat-file batch operations and support --batch-command approach (#35775 )

2026-01-08 13:37:36 -08:00

commit_info.go

Fix repo file list partial reloading for submodules (#35183 )

2025-07-31 09:34:51 +08:00

commit_reader.go

Refactor commit reader (#34542 )

2025-05-27 16:49:05 +00:00

commit_sha256_test.go

Move commit related functions to gitrepo package (#35600 )

2025-12-05 00:20:23 +00:00

commit_submodule_file_test.go

Fix various bugs (#35177 )

2025-07-30 07:08:59 +00:00

commit_submodule_file.go

Fix various bugs (#35177 )

2025-07-30 07:08:59 +00:00

commit_submodule.go

Fix submodule nil check (#35096 )

2025-07-16 12:07:38 +00:00

commit_test.go

Move commit related functions to gitrepo package (#35600 )

2025-12-05 00:20:23 +00:00

commit.go

Refactor git command stderr handling (#36402 )

2026-01-18 15:10:33 -08:00

config_submodule_test.go

Fix submodule parsing (#32571 )

2024-11-20 19:26:12 +00:00

config_submodule.go

Fix submodule parsing (#32571 )

2024-11-20 19:26:12 +00:00

config_test.go

Move git command to git/gitcmd (#35483 )

2025-09-15 23:33:12 -07:00

config.go

Move some functions to gitrepo package (#35543 )

2025-10-07 17:06:51 +08:00

diff_test.go

Run gopls modernize on codebase (#34751 )

2025-06-18 01:48:09 +00:00

diff.go

Refactor GetRepoRawDiffForFile to avoid unnecessary pipe or goroutine (#36434 )

2026-01-23 02:10:11 +00:00

error.go

Refactor git command context & pipeline (#36406 )

2026-01-21 01:35:14 +00:00

git_test.go

Refactor cat-file batch operations and support --batch-command approach (#35775 )

2026-01-08 13:37:36 -08:00

git.go

Use merge tree to detect conflicts when possible (#36400 )

2026-01-27 11:57:20 -08:00

gpg.go

Remove undocumented support of signing key in the repository git configuration file (#36143 )

2025-12-14 17:34:45 +00:00

grep_test.go

Remove wrong "git.DefaultContext" (#35364 )

2025-08-27 16:31:21 +00:00

grep.go

Use merge tree to detect conflicts when possible (#36400 )

2026-01-27 11:57:20 -08:00

hook.go

Refactor legacy code (#35708 )

2025-10-20 11:43:08 -07:00

key.go

Remove undocumented support of signing key in the repository git configuration file (#36143 )

2025-12-14 17:34:45 +00:00

last_commit_cache_gogit.go

Abstract hash function usage (#28138 )

2023-12-13 21:02:00 +00:00

last_commit_cache_nogogit.go

Implement FSFE REUSE for golang files (#21840 )

2022-11-27 18:20:29 +00:00

last_commit_cache.go

Run gopls modernize on codebase (#34751 )

2025-06-18 01:48:09 +00:00

log_name_status.go

Refactor git command stdio pipe (#36422 )

2026-01-22 06:04:26 +00:00

notes_gogit.go

Refactor ls-tree and git path related problems (#35858 )

2025-11-05 17:48:38 +00:00

notes_nogogit.go

Implement FSFE REUSE for golang files (#21840 )

2022-11-27 18:20:29 +00:00

notes_test.go

Update dependencies (#35733 )

2025-10-23 08:35:48 +00:00

notes.go

Implement FSFE REUSE for golang files (#21840 )

2022-11-27 18:20:29 +00:00

object_format.go

Make sure git version&feature are always prepared (#30877 )

2024-05-06 18:34:16 +02:00

object_id_gogit.go

Add support for sha256 repositories (#23894 )

2024-01-19 17:05:02 +01:00

object_id_test.go

Fix incorrect object id hash function (#30708 )

2024-04-26 09:49:48 +00:00

object_id.go

Enable addtional linters (#34085 )

2025-04-01 10:14:01 +00:00

parse_treeentry_test.go

Refactor ls-tree and git path related problems (#35858 )

2025-11-05 17:48:38 +00:00

parse_treeentry.go

Refactor cat-file batch operations and support --batch-command approach (#35775 )

2026-01-08 13:37:36 -08:00

parse.go

Improve diff file headers (#36215 )

2026-01-12 20:29:35 +08:00

README.md

move code.gitea.io/git to code.gitea.io/gitea/modules/git (#6364 )

2019-03-27 17:33:00 +08:00

ref_test.go

Refactor RefName (#33234 )

2025-01-13 14:01:53 +08:00

ref.go

improve the compare page (#36261 )

2026-01-01 10:32:19 -08:00

remote.go

Refactor git command context & pipeline (#36406 )

2026-01-21 01:35:14 +00:00

repo_base_gogit.go

Remove undocumented support of signing key in the repository git configuration file (#36143 )

2025-12-14 17:34:45 +00:00

repo_base_nogogit_test.go

Refactor cat-file batch operations and support --batch-command approach (#35775 )

2026-01-08 13:37:36 -08:00

repo_base_nogogit.go

Refactor cat-file batch operations and support --batch-command approach (#35775 )

2026-01-08 13:37:36 -08:00

repo_blob_test.go

Remove wrong "git.DefaultContext" (#35364 )

2025-08-27 16:31:21 +00:00

repo_blob.go

Fix panic when get editor config file (#36241 )

2025-12-25 19:26:23 -08:00

repo_branch_gogit.go

Fix typo in documentation of GetBranchNames() (#33330 )

2025-01-19 18:41:15 -05:00

repo_branch_nogogit.go

Use merge tree to detect conflicts when possible (#36400 )

2026-01-27 11:57:20 -08:00

repo_branch_test.go

Remove wrong "git.DefaultContext" (#35364 )

2025-08-27 16:31:21 +00:00

repo_branch.go

Move some functions to gitrepo package (#35543 )

2025-10-07 17:06:51 +08:00

repo_commit_gogit.go

Refactor git command stdio pipe (#36393 )

2026-01-17 18:11:46 +00:00

repo_commit_nogogit.go

Refactor git command stdio pipe (#36393 )

2026-01-17 18:11:46 +00:00

repo_commit_test.go

Remove wrong "git.DefaultContext" (#35364 )

2025-08-27 16:31:21 +00:00

repo_commit.go

Refactor git command stdio pipe (#36422 )

2026-01-22 06:04:26 +00:00

repo_commitgraph_gogit.go

Use filepath.Join instead of path.Join for file system file operations (#33978 )

2025-03-24 14:50:28 -07:00

repo_commitgraph.go

Move some functions to gitrepo package (#35543 )

2025-10-07 17:06:51 +08:00

repo_compare_test.go

Move some functions to gitrepo package (#35543 )

2025-10-07 17:06:51 +08:00

repo_compare.go

Refactor git command stdio pipe (#36422 )

2026-01-22 06:04:26 +00:00

repo_hook.go

Implement FSFE REUSE for golang files (#21840 )

2022-11-27 18:20:29 +00:00

repo_index.go

Refactor git command stdio pipe (#36422 )

2026-01-22 06:04:26 +00:00

repo_object.go

Refactor git command stdio pipe (#36422 )

2026-01-22 06:04:26 +00:00

repo_ref_gogit.go

Abstract hash function usage (#28138 )

2023-12-13 21:02:00 +00:00

repo_ref_nogogit.go

Refactor git command stdio pipe (#36422 )

2026-01-22 06:04:26 +00:00

repo_ref_test.go

Remove wrong "git.DefaultContext" (#35364 )

2025-08-27 16:31:21 +00:00

repo_ref.go

Move some functions to gitrepo package (#35543 )

2025-10-07 17:06:51 +08:00

repo_stats_test.go

Remove wrong "git.DefaultContext" (#35364 )

2025-08-27 16:31:21 +00:00

repo_stats.go

Refactor git command stdio pipe (#36422 )

2026-01-22 06:04:26 +00:00

repo_tag_gogit.go

Remove the duplicated function GetTags (#35375 )

2025-08-29 01:11:42 +00:00

repo_tag_nogogit.go

Refactor cat-file batch operations and support --batch-command approach (#35775 )

2026-01-08 13:37:36 -08:00

repo_tag_test.go

Remove the duplicated function GetTags (#35375 )

2025-08-29 01:11:42 +00:00

repo_tag.go

Refactor git command stdio pipe (#36422 )

2026-01-22 06:04:26 +00:00

repo_test.go

Move some functions to gitrepo package to reduce RepoPath reference directly (#36126 )

2025-12-12 01:15:40 +01:00

repo_tree_gogit.go

Refactor ls-tree and git path related problems (#35858 )

2025-11-05 17:48:38 +00:00

repo_tree_nogogit.go

Refactor cat-file batch operations and support --batch-command approach (#35775 )

2026-01-08 13:37:36 -08:00

repo_tree.go

Refactor git command stdio pipe (#36422 )

2026-01-22 06:04:26 +00:00

repo.go

Refactor git command stderr handling (#36402 )

2026-01-18 15:10:33 -08:00

signature_gogit.go

Refactor parseSignatureFromCommitLine (#29054 )

2024-02-09 11:02:53 +08:00

signature_nogogit.go

Refactor parseSignatureFromCommitLine (#29054 )

2024-02-09 11:02:53 +08:00

signature_test.go

Enable testifylint rules (#34075 )

2025-03-31 01:53:48 -04:00

signature.go

Refactor parseSignatureFromCommitLine (#29054 )

2024-02-09 11:02:53 +08:00

submodule_test.go

Move some functions to gitrepo package (#35543 )

2025-10-07 17:06:51 +08:00

submodule.go

Refactor git command stdio pipe (#36422 )

2026-01-22 06:04:26 +00:00

tag_test.go

Refactor commit signature parser (#30228 )

2024-04-01 20:23:17 +00:00

tag.go

Avoid creating unnecessary temporary cat file sub process (#33942 )

2025-04-04 16:19:19 -07:00

tree_blob_gogit.go

Refactor ls-tree and git path related problems (#35858 )

2025-11-05 17:48:38 +00:00

tree_blob_nogogit.go

Follow file symlinks in the UI to their target (#28835 )

2025-07-01 06:55:36 +08:00

tree_blob.go

Implement FSFE REUSE for golang files (#21840 )

2022-11-27 18:20:29 +00:00

tree_entry_common_test.go

Remove wrong "git.DefaultContext" (#35364 )

2025-08-27 16:31:21 +00:00

tree_entry_gogit_test.go

Refactor ls-tree and git path related problems (#35858 )

2025-11-05 17:48:38 +00:00

tree_entry_gogit.go

Fix panic when get editor config file (#36241 )

2025-12-25 19:26:23 -08:00

tree_entry_mode.go

Improve diff file headers (#36215 )

2026-01-12 20:29:35 +08:00

tree_entry_nogogit.go

Refactor cat-file batch operations and support --batch-command approach (#35775 )

2026-01-08 13:37:36 -08:00

tree_entry_test.go

Support rendering OpenAPI spec (#36449 )

2026-01-26 10:34:38 +08:00

tree_entry.go

Refactor ls-tree and git path related problems (#35858 )

2025-11-05 17:48:38 +00:00

tree_gogit.go

Refactor ls-tree and git path related problems (#35858 )

2025-11-05 17:48:38 +00:00

tree_nogogit.go

Refactor cat-file batch operations and support --batch-command approach (#35775 )

2026-01-08 13:37:36 -08:00

tree_test.go

Remove wrong "git.DefaultContext" (#35364 )

2025-08-27 16:31:21 +00:00

tree.go

Refactor ls-tree and git path related problems (#35858 )

2025-11-05 17:48:38 +00:00

utils_test.go

Fix various bugs (#35177 )

2025-07-30 07:08:59 +00:00

utils.go

fix attachment file size limit in server backend (#35519 )

2025-10-21 15:07:11 +00:00

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.