mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-01 09:51:39 -05:00
4199d28053
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> |
||
---|---|---|
.. | ||
archiver | ||
files | ||
adopt.go | ||
adopt_test.go | ||
avatar.go | ||
avatar_test.go | ||
branch.go | ||
cache.go | ||
check.go | ||
fork.go | ||
fork_test.go | ||
hooks.go | ||
lfs.go | ||
main_test.go | ||
push.go | ||
repository.go | ||
repository_test.go | ||
review.go | ||
review_test.go | ||
template.go | ||
transfer.go | ||
transfer_test.go |