Go-Gitea
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
gitea/modules/util
History
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>
 		2026-01-27 11:57:20 -08:00
..
filebuffer Uniform all temporary directories and allow customizing temp path (#32352) 2025-04-08 16:15:28 +00:00
rotatingfilewriter Run `gopls modernize` on codebase (#34751) 2025-06-18 01:48:09 +00:00
buffer.go Use merge tree to detect conflicts when possible (#36400) 2026-01-27 11:57:20 -08:00
color.go Address some CodeQL security concerns (#35572) 2025-10-04 01:21:26 +08:00
color_test.go Enable tenv and testifylint rules (#32852) 2024-12-15 10:41:29 +00:00
error.go Honor delete branch on merge repo setting when using merge API (#35488) 2025-10-22 05:06:56 +00:00
error_test.go Honor delete branch on merge repo setting when using merge API (#35488) 2025-10-22 05:06:56 +00:00
file_unix.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
file_unix_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
file_windows.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
io.go Limit reading bytes instead of ReadAll (#35928) 2025-11-12 19:44:49 +08:00
io_test.go Fix profile render when the README.md size is larger than 1024 bytes (#25131) 2023-06-13 09:02:25 +00:00
keypair.go Enable `unparam` linter (#31277) 2024-06-11 18:47:45 +00:00
keypair_test.go Enable tenv and testifylint rules (#32852) 2024-12-15 10:41:29 +00:00
legacy.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
legacy_test.go Upgrade golangci-lint to v1.64.5 (#33654) 2025-02-21 00:05:40 +08:00
map.go Fix possible panic (#34508) 2025-05-22 12:59:42 +00:00
map_test.go Fix possible panic (#34508) 2025-05-22 12:59:42 +00:00
pack.go Replace `interface{}` with `any` (#25686) 2023-07-04 18:36:08 +00:00
pack_test.go Add support for incoming emails (#22056) 2023-01-14 23:57:10 +08:00
paginate.go Replace `interface{}` with `any` (#25686) 2023-07-04 18:36:08 +00:00
paginate_test.go Enable testifylint rules (#34075) 2025-03-31 01:53:48 -04:00
path.go Refactor legacy code (#35708) 2025-10-20 11:43:08 -07:00
path_test.go Fix unittest and repo create bug (#33061) 2024-12-31 18:45:05 +08:00
remove.go Run `gopls modernize` on codebase (#34751) 2025-06-18 01:48:09 +00:00
runtime.go Move some functions to gitrepo package (#35543) 2025-10-07 17:06:51 +08:00
runtime_test.go Move some functions to gitrepo package (#35543) 2025-10-07 17:06:51 +08:00
sanitize.go Refactor to use UnsafeStringToBytes (#31358) 2024-06-14 01:26:33 +00:00
sanitize_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
sec_to_time.go Worktime tracking for the organization level (#19808) 2025-02-03 01:51:12 +08:00
sec_to_time_test.go Enable testifylint rules (#34075) 2025-03-31 01:53:48 -04:00
shellquote.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
shellquote_test.go Refactor older tests to use testify (#33140) 2025-01-09 09:21:47 +08:00
slice.go Enable gocritic `equalFold` and fix issues (#34952) 2025-07-06 16:53:34 +00:00
slice_test.go Replace `util.SliceXxx` with `slices.Xxx` (#26958) 2023-09-07 09:37:47 +00:00
string.go Fix http auth header parsing (#34936) 2025-07-03 03:02:38 +00:00
string_test.go Do not render truncated links in markdown (#32980) 2024-12-26 00:33:55 +08:00
time_str.go Enable gocritic `equalFold` and fix issues (#34952) 2025-07-06 16:53:34 +00:00
time_str_test.go Enable tenv and testifylint rules (#32852) 2024-12-15 10:41:29 +00:00
timer.go Rewrite queue (#24505) 2023-05-08 19:49:59 +08:00
timer_test.go Use a general approach to access custom/static/builtin assets (#24022) 2023-04-12 18:16:45 +08:00
truncate.go Fix various bugs (#35177) 2025-07-30 07:08:59 +00:00
truncate_test.go Fix various bugs (#35177) 2025-07-30 07:08:59 +00:00
url.go Add `RemoteAddress` to mirrors (#26952) 2023-09-16 16:03:02 +00:00
util.go Fix markdown render behaviors (#34122) 2025-04-05 11:56:48 +08:00
util_test.go Move ParseBool to optional (#33979) 2025-03-24 03:53:30 +00:00