This repository has been archived on 2024-01-04. You can view files and clone it, but cannot push or open issues or pull requests.
forgejo/services/pull
Gusted ebe569a268
Set correct PR status on 3way on conflict checking (#19457)
* Set correct PR status on 3way on conflict checking

- When 3-way merge is enabled for conflict checking, it has a new
interesting behavior that it doesn't return any error when it found a
conflict, so we change the condition to not check for the error, but
instead check if conflictedfiles is populated, this fixes a issue
whereby PR status wasn't correctly on conflicted PR's.
- Refactor the mergeable property(which was incorrectly set and lead me this
bug) to be more maintainable.
- Add a dedicated test for conflicting checking, so it should prevent
future issues with this.

* Fix linter
2022-04-21 22:55:45 +01:00
..
check.go Don't allow merging PR's which are being conflict checked (#19357) 2022-04-20 16:43:15 +02:00
check_test.go Add Goroutine stack inspector to admin/monitor (#19207) 2022-03-31 19:01:43 +02:00
commit_status.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
lfs.go Propagate context and ensure git commands run in request context (#17868) 2022-01-19 23:26:57 +00:00
main_test.go Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
merge.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
patch.go Set correct PR status on 3way on conflict checking (#19457) 2022-04-21 22:55:45 +01:00
patch_unmerged.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
pull.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
pull_test.go Append to existing trailers in generated squash commit message (#15980) 2021-06-25 13:01:43 -04:00
review.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
temp_repo.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
update.go Add config option to disable "Update branch by rebase" (#18745) 2022-03-04 03:30:49 -05:00