gitea

Commit Graph

Author	SHA1	Message	Date
Martin Scholz	26718a785a	Change git.cmd to RunWithContext (#18693 ) Change all `cmd...Pipeline` commands to `cmd.RunWithContext`. #18553 Co-authored-by: Martin Scholz <martin.scholz@versasec.com>	3 years ago
6543	3043eb36bf	Delete old git.NewCommand() and use it as git.NewCommandContext() (#18552 )	3 years ago
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>	3 years ago

Author

SHA1

Message

Date

Martin Scholz

26718a785a

Change git.cmd to RunWithContext (#18693 )

Change all `cmd...Pipeline` commands to `cmd.RunWithContext`.

#18553

Co-authored-by: Martin Scholz <martin.scholz@versasec.com>

3 years ago

6543

3043eb36bf

Delete old git.NewCommand() and use it as git.NewCommandContext() (#18552 )

3 years ago

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>

3 years ago

3 Commits (1eb0da58c399d35397d75c07b2fe41dd63aba3b4)