4 Commits (686d10b7f0c26baf91171124b382cbcdfa7bf025)

Author	SHA1	Message	Date
Md Ferdous Alam	429ba9c010	Use case-insensitive matching for Git error "Not a valid object name" (#36728) ... Fixes #36727 Git is lowercasing the `fatal: Not a valid object name` error message to follow its CodingGuidelines. This change makes the string matching case-insensitive so it works with both the current and future Git versions. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>	2026-02-24 12:25:34 +08:00
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
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)	2026-01-22 06:04:26 +00:00
wxiaoguang	9ea91e036f	Refactor git command context & pipeline (#36406) ... Less and simpler code, fewer bugs	2026-01-21 01:35:14 +00:00