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
..
actions	Add a doctor command to fix inconsistent run status (#35840 )	5 months ago
activities	Fix incorrect pull request counter (#35819 )	5 months ago
admin	Don't block site admin's operation if SECRET_KEY is lost (#35721 )	5 months ago
asymkey	Add an option to automatically verify SSH keys from LDAP (#35927 )	3 months ago
auth	Don't block site admin's operation if SECRET_KEY is lost (#35721 )	5 months ago
avatars	Remove incorrect "db.DefaultContext" usages (#35366 )	7 months ago
db	Fix various typos in codebase (#35480 )	6 months ago
dbfs	Remove incorrect "db.DefaultContext" usages (#35366 )	7 months ago
fixtures	Add a doctor command to fix inconsistent run status (#35840 )	5 months ago
git	Fix typos: unknow -> unknown, pktLineTypeUnknow -> pktLineTypeUnknown (#36419 )	2 months ago
issues	Use merge tree to detect conflicts when possible (#36400 )	2 months ago
migrations	Fix missing repository id when migrating release attachments (#36389 )	2 months ago
organization	Fix team member access check (#35899 )	5 months ago
packages	Remove incorrect "db.DefaultContext" usages (#35366 )	7 months ago
perm	Bump golangci-lint to 2.7.2, enable modernize stringsbuilder (#36180 )	3 months ago
project	Fix permission check on org project operations (#36318 )	2 months ago
pull	Fix incorrect viewed files counter if file has changed (#36009 )	4 months ago
renderhelper	fix: generate IDs for HTML headings without id attribute (#36233 )	3 months ago
repo	Fix missing repository id when migrating release attachments (#36389 )	2 months ago
secret	Don't block site admin's operation if SECRET_KEY is lost (#35721 )	5 months ago
shared/types	Refactor locale&string&template related code (#29165 )	2 years ago
system	Remove incorrect "db.DefaultContext" usages (#35366 )	7 months ago
unit	Run `gopls modernize` on codebase (#34751 )	9 months ago
unittest	Refactor db package (#35380 )	7 months ago
user	Fix openid setting check (#36346 )	2 months ago
webhook	Remove incorrect "db.DefaultContext" usages (#35366 )	7 months ago
main_test.go	make writing main test easier (#27270 )	3 years ago
repo.go	Use db.WithTx/WithTx2 instead of TxContext when possible (#35130 )	8 months ago
repo_test.go	Remove incorrect "db.DefaultContext" usages (#35366 )	7 months ago