You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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>
2 years ago
..
check.go Supports wildcard protected branch (#20825) 2 years ago
check_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
comment.go Rename almost all Ctx functions (#22071) 2 years ago
commit_status.go Supports wildcard protected branch (#20825) 2 years ago
edits.go Implement FSFE REUSE for golang files (#21840) 2 years ago
lfs.go Use context parameter in models/git (#22367) 2 years ago
main_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
merge.go When updating by rebase we need to set the environment for head repo (#22535) 2 years ago
merge_test.go Support template for merge message description (#22248) 2 years ago
patch.go Supports wildcard protected branch (#20825) 2 years ago
patch_unmerged.go Implement FSFE REUSE for golang files (#21840) 2 years ago
pull.go some refactor about code comments (#20821) 2 years ago
pull_test.go Support template for merge message description (#22248) 2 years ago
review.go some refactor about code comments (#20821) 2 years ago
temp_repo.go Use complete SHA to create and query commit status (#22244) 2 years ago
update.go Fix 500 error viewing pull request when fork has pull requests disabled (#22512) 2 years ago