mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-10 11:25:56 -05:00
3c531d3957
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> |
||
---|---|---|
.. | ||
check.go | ||
check_test.go | ||
commit_status.go | ||
edits.go | ||
lfs.go | ||
main_test.go | ||
merge.go | ||
patch.go | ||
patch_unmerged.go | ||
pull.go | ||
pull_test.go | ||
review.go | ||
temp_repo.go | ||
update.go |