3 people 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 <[email protected]>

Signed-off-by: Andrew Thornton <[email protected]>
Co-authored-by: John Olheiser <[email protected]>

2023-01-19 17:31:44 -05:00

..

check_test.go

Implement FSFE REUSE for golang files (#21840)

2022-11-27 18:20:29 +00:00

check.go

Supports wildcard protected branch (#20825)

2023-01-16 16:00:22 +08:00

comment.go

Rename almost all Ctx functions (#22071)

2022-12-10 10:46:31 +08:00

commit_status.go

Supports wildcard protected branch (#20825)

2023-01-16 16:00:22 +08:00

edits.go

Implement FSFE REUSE for golang files (#21840)

2022-11-27 18:20:29 +00:00

lfs.go

Use context parameter in models/git (#22367)

2023-01-09 11:50:54 +08:00

main_test.go

Implement FSFE REUSE for golang files (#21840)

2022-11-27 18:20:29 +00:00

merge_test.go

Support template for merge message description (#22248)

2022-12-29 14:40:20 +02:00

merge.go

When updating by rebase we need to set the environment for head repo (#22535)

2023-01-19 17:31:44 -05:00

patch_unmerged.go

Implement FSFE REUSE for golang files (#21840)

2022-11-27 18:20:29 +00:00

patch.go

Supports wildcard protected branch (#20825)

2023-01-16 16:00:22 +08:00

pull_test.go

Support template for merge message description (#22248)

2022-12-29 14:40:20 +02:00

pull.go

some refactor about code comments (#20821)

2023-01-17 15:03:44 -06:00

review.go

some refactor about code comments (#20821)

2023-01-17 15:03:44 -06:00

temp_repo.go

Use complete SHA to create and query commit status (#22244)

2022-12-27 21:12:49 +08:00

update.go

Fix 500 error viewing pull request when fork has pull requests disabled (#22512)

2023-01-18 13:54:57 -06:00