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

mirror of https://github.com/go-gitea/gitea synced 2026-02-03 11:10:40 +00:00

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>

This commit is contained in:

Lunny Xiao

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

committed by

GitHub

parent 125257eacf

commit 1463426a27

29 changed files with 607 additions and 126 deletions

									
										templates/repo/issue/view_content/pull_merge_box.tmpl
									
		+2
		
												View File
												
				@@ -82,6 +82,8 @@

								<ul>

									{{range .ConflictedFiles}}

									<li>{{.}}</li>

									{{else}}

									<li>{{ctx.Locale.Tr "repo.pulls.files_conflicted_no_listed_files"}}</li>

									{{end}}

								</ul>

							{{else if .IsPullRequestBroken}}