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

..

archiver

Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551)

2022-10-24 20:29:17 +01:00

files

Use complete SHA to create and query commit status (#22244) (#22257)

2022-12-28 11:03:21 +01:00

adopt_test.go

Fix repository adoption on Windows (#21646) (#21650)

2022-11-01 22:32:03 +00:00

adopt.go

Do not list active repositories as unadopted (#22034) (#22166)

2022-12-19 12:48:38 +00:00

avatar_test.go

Refactor AssertExistsAndLoadBean to use generics (#20797)

2022-08-16 10:22:25 +08:00

avatar.go

Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551)

2022-10-24 20:29:17 +01:00

branch.go

Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551)

2022-10-24 20:29:17 +01:00

cache.go

Slightly simplify LastCommitCache (#20444)

2022-07-25 16:39:42 +01:00

check.go

Continue GCing other repos on error in one repo (#22422) (#22425)

2023-01-13 15:29:16 -06:00

fork_test.go

Move some files into models' sub packages (#20262)

2022-08-25 10:31:57 +08:00

fork.go

Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551)

2022-10-24 20:29:17 +01:00

hooks.go

Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551)

2022-10-24 20:29:17 +01:00

main_test.go

Use a struct as test options (#19393)

2022-04-14 21:58:21 +08:00

push.go

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

2023-01-19 17:31:20 -05:00

repository_test.go

Move some repository related code into sub package (#19711)

2022-06-06 16:01:49 +08:00

repository.go

Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551)

2022-10-24 20:29:17 +01:00

review_test.go

Refactor AssertExistsAndLoadBean to use generics (#20797)

2022-08-16 10:22:25 +08:00

review.go

Move some repository related code into sub package (#19711)

2022-06-06 16:01:49 +08:00

template.go

Remove manual rollback for failed generated repositories (#20639)

2022-08-09 17:41:52 +08:00

transfer_test.go

Move some files into models' sub packages (#20262)

2022-08-25 10:31:57 +08:00

transfer.go

Move some files into models' sub packages (#20262)

2022-08-25 10:31:57 +08:00