1
1
mirror of https://github.com/go-gitea/gitea synced 2025-01-21 23:24:29 +00:00
zeripath f1e85622da
Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004)
The current TestPatch conflict code uses a plain git apply which does not properly
account for 3-way merging. However, we can improve things using `git read-tree -m` to
do a three-way merge then follow the algorithm used in merge-one-file. We can also use 
`--patience` and/or `--histogram` to generate a nicer diff for applying patches too.

Fix #13679
Fix #6417

Signed-off-by: Andrew Thornton <art27@cantab.net>
2021-12-19 05:19:25 +01:00
..
2021-10-24 22:12:43 +01:00
2021-12-02 15:28:08 +08:00
2021-10-13 14:20:11 -04:00
2021-10-08 15:08:22 +02:00
2021-12-02 15:28:08 +08:00
2021-12-02 15:28:08 +08:00
2021-10-17 20:47:12 +01:00
2020-12-22 21:44:25 +01:00
2021-07-20 15:16:20 +02:00

Git Module

This module is merged from https://github.com/go-gitea/git which is a Go module to access Git through shell commands. Now it's a part of gitea's main repository for easier pull request.