1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-10 11:25:56 -05:00
forgejo/services/pull
zeripath 3c531d3957
When updating by rebase we need to set the environment for head repo (#22535) (#22536)
Backport #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>
2023-01-19 17:31:20 -05:00
..
check.go Use complete SHA to create and query commit status (#22244) (#22257) 2022-12-28 11:03:21 +01:00
check_test.go Refactor AssertExistsAndLoadBean to use generics (#20797) 2022-08-16 10:22:25 +08:00
commit_status.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
edits.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
lfs.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
main_test.go Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
merge.go When updating by rebase we need to set the environment for head repo (#22535) (#22536) 2023-01-19 17:31:20 -05:00
patch.go Add setting to disable the git apply step in test patch (#22130) (#22170) 2022-12-22 11:59:10 +01:00
patch_unmerged.go Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2022-10-24 20:29:17 +01:00
pull.go Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2022-10-24 20:29:17 +01:00
pull_test.go Refactor AssertExistsAndLoadBean to use generics (#20797) 2022-08-16 10:22:25 +08:00
review.go Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2022-10-24 20:29:17 +01:00
temp_repo.go Use complete SHA to create and query commit status (#22244) (#22257) 2022-12-28 11:03:21 +01:00
update.go Fix 500 error viewing pull request when fork has pull requests disabled (#22512) (#22515) 2023-01-18 22:50:51 +01:00