0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-10-31 19:28:58 +01:00
gitea/services/pull
zeripath 4199d28053
When updating by rebase we need to set the environment for head repo (#22535)
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 #18802

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
check_test.go
comment.go
commit_status.go
edits.go
lfs.go
main_test.go
merge.go When updating by rebase we need to set the environment for head repo (#22535) 2023-01-19 17:31:44 -05:00
merge_test.go
patch.go
patch_unmerged.go
pull.go some refactor about code comments (#20821) 2023-01-17 15:03:44 -06:00
pull_test.go
review.go some refactor about code comments (#20821) 2023-01-17 15:03:44 -06:00
temp_repo.go
update.go Fix 500 error viewing pull request when fork has pull requests disabled (#22512) 2023-01-18 13:54:57 -06:00