1
0
Fork 0
forked from NYANDEV/forgejo
forgejo/services/pull
zeripath 4199d28053
When updating by rebase we need to set the environment for head repo ()
The update by rebase code reuses the merge code but shortcircuits and
pushes back up to the head. However, it doesn't set the correct pushing
environment - and just uses the same environment as the base repo. This
leads to the push update failing and thence the PR becomes out-of-sync
with the head.

This PR fixes this and adjusts the trace logging elsewhere to help make
this clearer.

Fix 

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

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
2023-01-19 17:31:44 -05:00
..
check.go Supports wildcard protected branch () 2023-01-16 16:00:22 +08:00
check_test.go Implement FSFE REUSE for golang files () 2022-11-27 18:20:29 +00:00
comment.go Rename almost all Ctx functions () 2022-12-10 10:46:31 +08:00
commit_status.go Supports wildcard protected branch () 2023-01-16 16:00:22 +08:00
edits.go Implement FSFE REUSE for golang files () 2022-11-27 18:20:29 +00:00
lfs.go Use context parameter in models/git () 2023-01-09 11:50:54 +08:00
main_test.go Implement FSFE REUSE for golang files () 2022-11-27 18:20:29 +00:00
merge.go When updating by rebase we need to set the environment for head repo () 2023-01-19 17:31:44 -05:00
merge_test.go Support template for merge message description () 2022-12-29 14:40:20 +02:00
patch.go Supports wildcard protected branch () 2023-01-16 16:00:22 +08:00
patch_unmerged.go Implement FSFE REUSE for golang files () 2022-11-27 18:20:29 +00:00
pull.go some refactor about code comments () 2023-01-17 15:03:44 -06:00
pull_test.go Support template for merge message description () 2022-12-29 14:40:20 +02:00
review.go some refactor about code comments () 2023-01-17 15:03:44 -06:00
temp_repo.go Use complete SHA to create and query commit status () 2022-12-27 21:12:49 +08:00
update.go Fix 500 error viewing pull request when fork has pull requests disabled () 2023-01-18 13:54:57 -06:00