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	Bugfix: Potential incorrect runID in run status update (#36437 )	2 months ago
agit	Refactor git command stderr handling (#36402 )	2 months ago
asymkey	Some refactors about GetMergeBase (#36186 )	2 months ago
attachment	fix attachment file size limit in server backend (#35519 )	5 months ago
auth	Add an option to automatically verify SSH keys from LDAP (#35927 )	3 months ago
automerge	Remove unnecessary function parameter (#35765 )	5 months ago
automergequeue	Fix various trivial problems (#35714 )	5 months ago
context	fix: Improve image captcha contrast for dark mode (#36265 )	2 months ago
contexttest	Fix diff view style handling (#36324 )	3 months ago
convert	fix: typos in comments (#36394 )	2 months ago
cron	Refactor git command context & pipeline (#36406 )	2 months ago
doctor	Refactor git command stderr handling (#36402 )	2 months ago
externalaccount	Refactor OpenIDConnect to support SSH/FullName sync (#34978 )	9 months ago
feed	Remove incorrect "db.DefaultContext" usages (#35366 )	7 months ago
forms	Move assign project when creating pull request to the same database transaction (#36244 )	3 months ago
git	Some refactors about GetMergeBase (#36186 )	2 months ago
gitdiff	Normalize guessed languages for code highlighting (#36450 )	2 months ago
indexer	…
issue	Some refactors about GetMergeBase (#36186 )	2 months ago
lfs	Add chunked transfer encoding support for LFS uploads (#36380 )	2 months ago
mailer	Refactor template render (#36438 )	2 months ago
markup	Refactor template render (#36438 )	2 months ago
migrations	Refactor GetRepoRawDiffForFile to avoid unnecessary pipe or goroutine (#36434 )	2 months ago
mirror	Refactor git command stdio pipe (#36422 )	2 months ago
notify	Don't send trigger for a pending review's comment create/update/delete (#34928 )	9 months ago
oauth2_provider	Make OAuth2 issuer configurable (#35915 )	5 months ago
org	Add more check for stopwatch read or list (#36340 )	3 months ago
packages	feat(debian): use explicit, stronger defaults for newly generated repo signing keys (#36236 )	3 months ago
projects	Remove incorrect "db.DefaultContext" usages (#35366 )	7 months ago
pull	Use merge tree to detect conflicts when possible (#36400 )	2 months ago
release	Refactor git command stderr handling (#36402 )	2 months ago
repository	Use merge tree to detect conflicts when possible (#36400 )	2 months ago
secrets	Fix various bugs (#35684 )	5 months ago
task	Remove incorrect "db.DefaultContext" usages (#35366 )	7 months ago
uinotification	Remove incorrect "db.DefaultContext" usages (#35366 )	7 months ago
user	Release attachments must belong to the intended repo (#36347 )	2 months ago
versioned_migration	Remove wrong "git.DefaultContext" (#35364 )	7 months ago
webhook	Bump golangci-lint to 2.7.2, enable modernize stringsbuilder (#36180 )	3 months ago
webtheme	Support rendering OpenAPI spec (#36449 )	2 months ago
wiki	Refactor git command stdio pipe (#36422 )	2 months ago