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
..
activitypub
analyze
appstate	Decouple unit test code from business code (#17623)	2021-11-12 22:36:47 +08:00
auth
avatar	Add user settings key/value DB table (#16834)	2021-11-22 04:47:23 -05:00
base
cache	Test cache during init (#17852)	2021-12-06 00:24:57 +08:00
charset	Read expected buffer size (#17409)	2021-10-24 22:12:43 +01:00
context	Prevent double decoding of % in url params (#17997)	2021-12-16 17:40:18 +00:00
convert	Some repository refactors (#17950)	2021-12-12 23:48:20 +08:00
csv	Properly determine CSV delimiter (#17459)	2021-10-30 23:50:40 +08:00
doctor	Move keys to models/asymkey (#17917)	2021-12-10 16:14:24 +08:00
emoji
eventsource
generate
git	Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004)	2021-12-19 05:19:25 +01:00
gitgraph	Add missing X-Total-Count and fix some related bugs (#17968)	2021-12-15 13:39:34 +08:00
graceful	Make SSL cipher suite configurable (#17440)	2021-11-20 01:12:43 -05:00
hcaptcha
highlight	Add .gitattribute assisted language detection to blame, diff and render (#17590)	2021-11-17 20:37:00 +00:00
hostmatcher	Use hostmatcher to replace matchlist, improve security (#17605)	2021-11-20 17:34:05 +08:00
httpcache	Use a variable but a function for IsProd because of a slight performance increment (#17368)	2021-10-20 16:37:19 +02:00
httplib
indexer	Prevent hang in git cat-file if repository is not a valid repository and other fixes (#17991)	2021-12-16 19:01:14 +00:00
json	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
lfs	Use hostmatcher to replace matchlist, improve security (#17605)	2021-11-20 17:34:05 +08:00
log	A better go code formatter, and now make fmt can run in Windows (#17684)	2021-11-17 20:34:35 +08:00
markup	Fixed emoji alias not parsed in links (#16221)	2021-12-15 23:49:12 +00:00
metrics
migration	Use fmt.Sprintf correctly (#17886)	2021-12-02 20:36:50 +01:00
nosql	Remove unnecessary variable assignments (#17695)	2021-11-18 09:33:06 +08:00
notification	Fix rename notification bug (#18008)	2021-12-17 14:24:47 +08:00
options
password
pprof
private	Move keys to models/asymkey (#17917)	2021-12-10 16:14:24 +08:00
process	Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125)	2021-11-30 20:06:32 +00:00
proxy
public
queue	Prevent deadlock in TestPersistableChannelQueue (#17717)	2021-11-19 01:13:25 +00:00
recaptcha
references
repository	Make AvatarRenderedSizeFactor configurable and set it to 3 (#17951)	2021-12-16 10:18:38 +08:00
secret
session
setting	Make AvatarRenderedSizeFactor configurable and set it to 3 (#17951)	2021-12-16 10:18:38 +08:00
ssh	Move keys to models/asymkey (#17917)	2021-12-10 16:14:24 +08:00
storage
structs	Add option to define refs in issue templates (#17842)	2021-12-17 21:29:09 +00:00
svg
sync
templates	Make AvatarRenderedSizeFactor configurable and set it to 3 (#17951)	2021-12-16 10:18:38 +08:00
test	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
timeutil
translation
typesniffer	Read expected buffer size (#17409)	2021-10-24 22:12:43 +01:00
updatechecker	Use JSON module instead of stdlib json (#18003)	2021-12-17 09:15:02 +08:00
upload	Replace regex usage for MIME parsing (#17831)	2021-11-27 19:12:43 +08:00
uri
user
util	Fix a panic in NotifyCreateIssueComment (caused by string truncation) (#17928)	2021-12-09 05:41:17 +00:00
validation
web	Remove unnecessary variable assignments (#17695)	2021-11-18 09:33:06 +08:00