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
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>
2 years ago
..
agit Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2 years ago
asymkey Refactor AssertExistsAndLoadBean to use generics (#20797) 3 years ago
attachment Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2 years ago
auth refactor auth interface to return error when verify failure (#22119) (#22259) 2 years ago
automerge Add more linters to improve code readability (#19989) 3 years ago
comments Move issues related files into models/issues (#19931) 3 years ago
context Move almost all functions' parameter db.Engine to context.Context (#19748) 3 years ago
cron Refactor git command arguments and make all arguments to be safe to be used (#21535) 2 years ago
externalaccount Refactor auth package (#17962) 3 years ago
forms Revert unrelated changes for SMTP auth (#21767) (#21768) 2 years ago
gitdiff Refactor git command arguments and make all arguments to be safe to be used (#21535) 2 years ago
issue Fix issue not auto-closing when it includes a reference to a branch (#22514) (#22521) 2 years ago
lfs Prevent Authorization header for presigned LFS urls (#21531) 2 years ago
mailer Correct the fallbacks for mailer configuration (#21945) (#21953) 2 years ago
markup Link mentioned user in markdown only if they are visible to viewer (#21554) 2 years ago
migrations Fix migration from GitBucket (#22465) 2 years ago
mirror Refactor git command arguments and make all arguments to be safe to be used (#21535) 2 years ago
org Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2 years ago
packages refactor auth interface to return error when verify failure (#22119) (#22259) 2 years ago
pull When updating by rebase we need to set the environment for head repo (#22535) (#22536) 2 years ago
release Revert "Do not send notifications for draft releases (#21451)" (#21594) 2 years ago
repository When updating by rebase we need to set the environment for head repo (#22535) (#22536) 2 years ago
task Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2 years ago
user Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2 years ago
webhook Fix wechatwork webhook sends empty content in PR review (#21762) (#22440) 2 years ago
wiki Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2 years ago