gitea

20263 Commits

20 Branches

245 Tags

888 MiB

Tree: 65d93d819b

Commit Graph

Author	SHA1	Message	Date
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>	1 week ago
wxiaoguang	3a09d7aa8d	Refactor git command stdio pipe (#36422 ) Most potential deadlock problems should have been fixed, and new code is unlikely to cause new problems with the new design. Also raise the minimum Git version required to 2.6.0 (released in 2015)	2 weeks ago
wxiaoguang	9ea91e036f	Refactor git command context & pipeline (#36406 ) Less and simpler code, fewer bugs	2 weeks ago

Author

SHA1

Message

Date

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>

1 week ago

wxiaoguang

3a09d7aa8d

Refactor git command stdio pipe (#36422 )

Most potential deadlock problems should have been fixed, and new code is
unlikely to cause new problems with the new design.

Also raise the minimum Git version required to 2.6.0 (released in 2015)

2 weeks ago

wxiaoguang

9ea91e036f

Refactor git command context & pipeline (#36406 )

Less and simpler code, fewer bugs

2 weeks ago

3 Commits (65d93d819b7eacea4ddd1babfdc58ad7004e405a)