Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 4 commits into from
Jan 19, 2023
Merged

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

merged 4 commits into from
Jan 19, 2023

Commits on Jan 19, 2023

  1. When updating by rebase we need to set the environment for head repo (g… 

    …o-gitea#22535)

Backport go-gitea#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 go-gitea#18802

Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    30017e3 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/release/v1.18' into backport-225… 

    …35-v1.18
    @zeripath
    zeripath committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    038a042 View commit details
    Browse the repository at this point in the history

  3. update changelog 

    Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    2798b89 View commit details
    Browse the repository at this point in the history

  4. and this pr too 

    Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    4aadee2 View commit details
    Browse the repository at this point in the history