gitea

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>		2 months ago
..
archive.go	Refactor git command stdio pipe (#36422 )	2 months ago
blame.go	Refactor git command stdio pipe (#36422 )	2 months ago
blame_sha256_test.go	Move blame to gitrepo (#36161 )	3 months ago
blame_test.go	Move blame to gitrepo (#36161 )	3 months ago
branch.go	Refactor git command stderr handling (#36402 )	2 months ago
cat_file.go	Refactor cat-file batch operations and support `--batch-command` approach (#35775 )	3 months ago
clone.go	Move some functions to gitrepo package to reduce RepoPath reference directly (#36126 )	4 months ago
command.go	Refactor git command stderr handling (#36402 )	2 months ago
commit.go	Refactor git command stderr handling (#36402 )	2 months ago
commit_file.go	Refactor git command stdio pipe (#36422 )	2 months ago
commit_file_test.go	Move commit related functions to gitrepo package (#35600 )	4 months ago
commit_test.go	Move some functions to gitrepo package to reduce RepoPath reference directly (#36126 )	4 months ago
commitgraph.go	Use gitrepo.Repository instead of wikipath (#35398 )	5 months ago
compare.go	Refactor git command stderr handling (#36402 )	2 months ago
compare_test.go	Move GetDiverging functions to gitrepo (#35524 )	6 months ago
config.go	Refactor git command stderr handling (#36402 )	2 months ago
diff.go	Refactor git command stdio pipe (#36422 )	2 months ago
fetch.go	Some refactors about GetMergeBase (#36186 )	2 months ago
fsck.go	Move some functions to gitrepo package (#35543 )	6 months ago
gitrepo.go	Some refactor for repo path (#36251 )	3 months ago
hooks.go	Don't create duplicated functions for code repositories and wiki repositories (#33924 )	1 year ago
main_test.go	Use merge tree to detect conflicts when possible (#36400 )	2 months ago
merge.go	Refactor git command stderr handling (#36402 )	2 months ago
merge_tree.go	Use merge tree to detect conflicts when possible (#36400 )	2 months ago
merge_tree_test.go	Use merge tree to detect conflicts when possible (#36400 )	2 months ago
push.go	Use gitrepo's clone and push when possible (#36093 )	4 months ago
ref.go	Move some functions to gitrepo package (#35543 )	6 months ago
remote.go	Refactor git command stderr handling (#36402 )	2 months ago
repo_lock.go	Some refactors about GetMergeBase (#36186 )	2 months ago
signing.go	Remove undocumented support of signing key in the repository git configuration file (#36143 )	4 months ago
size.go	Move some functions to gitrepo package (#35543 )	6 months ago
tag.go	Move git references checking to gitrepo packages to reduce expose of repository path (#33891 )	1 year ago
url.go	Use repo as of renderctx's member rather than a repoPath on metas (#29222 )	2 years ago
walk_gogit.go	Refactor request context (#32956 )	1 year ago
walk_nogogit.go	Simplify how git repositories are opened (#28937 )	2 years ago