forgejo-federation/services
zeripath 97eb37e823
Fix rebase conflict detection in git 2.26 (#10929)
* Fix rebase conflict detection in git 2.26

Git changed the technique used in rebase from
simple apply-patches to use merge. This breaks
our conflict detection code.

Signed-off-by: Andrew Thornton <art27@cantab.net>

* As per @techknowlogick reduce copying

Signed-off-by: Andrew Thornton <art27@cantab.net>
2020-04-03 19:00:41 +03:00
..
comments Refactor pull request review (#8954) 2019-11-14 10:57:36 +08:00
externalaccount Allow externalID to be UUID (#8551) 2019-10-17 10:06:28 +08:00
gitdiff Some refactor on git diff and ignore getting commit information failed on migrating pull request review comments (#9996) 2020-01-28 08:02:03 +00:00
issue Add Organization Wide Labels (#10814) 2020-04-01 01:14:46 -03:00
mailer [BugFix] Avoid mailing explicit unwatched (#10475) 2020-02-27 10:07:05 +00:00
mirror Move newbranch to standalone package (#9627) 2020-01-14 11:38:04 +08:00
pull Fix rebase conflict detection in git 2.26 (#10929) 2020-04-03 19:00:41 +03:00
release Move PushUpdateAddDeleteTags to repository module from models (#10106) 2020-02-03 09:47:04 +01:00
repository API endpoint for repo transfer (#9947) 2020-01-31 15:49:04 +00:00
wiki Handle push rejection in branch and upload (#10854) 2020-03-28 01:13:18 -03:00