runbot icon indicating copy to clipboard operation
runbot copied to clipboard

Fix broken freeze wizard: needs to fetch PR heads before integrating

Open xmo-odoo opened this issue 2 years ago • 1 comments

Forgot to fix when the staging / merging was moved locally: the freeze wizard is missing the part where it retrieves PR head commits, so when it tries to merge them it blows up. Dumb mistake.

xmo-odoo avatar Oct 26 '23 19:10 xmo-odoo

After some initial investigation it turns out that not only had I not thought to test the cross-repo case, even if I had I'd probably have missed it: the implementation of git-upload-pack (the operation for which the repo sends requested objects to the client) of dummy central currently ignores the client's requests, it always packs the entire network and sends that.

So the client always has all the objects of all the PRs, even though it never asks for any of them. Thus this issue is silently hidden.

Now obviously that would not have mattered if I'd fetched the head commits regardless as is done during staging, but that made the issue harder to notice.

xmo-odoo avatar Oct 27 '23 09:10 xmo-odoo