Shiloh/githaven
Shiloh/githaven
1
0
Fork 0
Code Issues Pull Requests Actions1 Packages Projects Releases Wiki Activity
203681d084
githaven/services/repository
History
zeripath 4199d28053
When updating by rebase we need to set the environment for head repo () 
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 

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>
2023-01-19 17:31:44 -05:00
..
archiver
refactor some functions to support ctx as first parameter ()
2022-12-03 10:48:26 +08:00
files
Supports wildcard protected branch ()
2023-01-16 16:00:22 +08:00
adopt_test.go
Implement FSFE REUSE for golang files ()
2022-11-27 18:20:29 +00:00
adopt.go
Change use of Walk to WalkDir to improve disk performance ()
2023-01-16 16:21:44 +00:00
avatar_test.go
Unify hashing for avatar ()
2023-01-02 22:46:39 +01:00
avatar.go
Unify hashing for avatar ()
2023-01-02 22:46:39 +01:00
branch.go
Supports wildcard protected branch ()
2023-01-16 16:00:22 +08:00
cache.go
Implement FSFE REUSE for golang files ()
2022-11-27 18:20:29 +00:00
check.go
Continue GCing other repos on error in one repo ()
2023-01-13 09:48:48 +08:00
fork_test.go
Add option to prohibit fork if user reached maximum limit of repositories ()
2022-12-27 15:21:14 -06:00
fork.go
Add option to prohibit fork if user reached maximum limit of repositories ()
2022-12-27 15:21:14 -06:00
hooks.go
Implement FSFE REUSE for golang files ()
2022-11-27 18:20:29 +00:00
lfs.go
Add cron method to gc LFS MetaObjects ()
2023-01-16 13:50:53 -06:00
main_test.go
Implement FSFE REUSE for golang files ()
2022-11-27 18:20:29 +00:00
push.go
When updating by rebase we need to set the environment for head repo ()
2023-01-19 17:31:44 -05:00
repository_test.go
refactor some functions to support ctx as first parameter ()
2022-12-03 10:48:26 +08:00
repository.go
Rename almost all Ctx functions ()
2022-12-10 10:46:31 +08:00
review_test.go
Implement FSFE REUSE for golang files ()
2022-11-27 18:20:29 +00:00
review.go
Implement FSFE REUSE for golang files ()
2022-11-27 18:20:29 +00:00
template.go
Implement FSFE REUSE for golang files ()
2022-11-27 18:20:29 +00:00
transfer_test.go
Rename almost all Ctx functions ()
2022-12-10 10:46:31 +08:00
transfer.go
Rename almost all Ctx functions ()
2022-12-10 10:46:31 +08:00