gitea

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

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>		5 days ago
..
command.go	Use merge tree to detect conflicts when possible (#36400 )	5 days ago
command_test.go	Refactor git command stdio pipe (#36422 )	2 weeks ago
context.go	Use merge tree to detect conflicts when possible (#36400 )	5 days ago
env.go	Move git command to git/gitcmd (#35483 )	5 months ago
error.go	Use merge tree to detect conflicts when possible (#36400 )	5 days ago
pipe.go	Refactor git command stdio pipe (#36422 )	2 weeks ago