gitea/services/pull
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
..
check_test.go Only check for conflicts/merging if the PR has not been merged in the interim (#10132) 2020-02-10 01:09:31 +02:00
check.go Only update merge_base in checker if not already merged (#10908) 2020-04-01 15:02:11 +03:00
commit_status.go Fix bug on pull view when required status check no ci result (#10648) 2020-03-07 07:33:20 +00:00
lfs.go Add basic repository lfs management (#7199) 2019-10-28 18:31:55 +00:00
main_test.go Move some pull request functions from models to services (#9266) 2019-12-06 21:44:10 -05:00
merge.go Fix rebase conflict detection in git 2.26 (#10929) 2020-04-03 19:00:41 +03:00
patch.go Generate Diff and Patch direct from Pull head (#10936) 2020-04-03 21:21:41 +08:00
pull_test.go Move PushToBaseRepo from models to services/pull (#9352) 2019-12-15 04:28:51 +01:00
pull.go Only update merge_base in checker if not already merged (#10908) 2020-04-01 15:02:11 +03:00
review.go Display pull request head branch even the branch deleted or repository deleted (#10413) 2020-03-02 22:31:55 +00:00
temp_repo.go Prevent deadlock in pull_service.GetDiverging(pr) (#10905) 2020-04-01 20:03:08 +01:00
update.go Prevent deadlock in pull_service.GetDiverging(pr) (#10905) 2020-04-01 20:03:08 +01:00