Use --force-with-lease instead of --force on git push

[herndlm]

What would you like Renovate to be able to do?

I have renovate running with :rebaseStalePrs to keep branches updated and today I managed to work at a branch the same time as renovate did. Apparently I finished my work before the bot and I was using --force-with-lease which was working fine. Then the bot finished it's work too using --force which overwrote my work. When I was checking the PR I was confused for a good minute and tried to figure out where my changes went.

I guess this is pretty rare to happen, but I suggest that renovate uses --force-with-lease instead to prevent exactly what I described. In that case the push should be safer and fail if the remote ref is not the expected value (most likely because somebody edited it inbetween). See also https://git-scm.com/docs/git-push#Documentation/git-push.txt---no-force-with-lease

If you have any ideas on how this should be implemented, please tell us here.

If I'm not mistaken, it should be as simple as replacing --force with --force-with-lease in https://github.com/renovatebot/renovate/blob/26.19.1/lib/util/git/index.ts#L804

Is this a feature you are interested in implementing yourself?

Yes

[herndlm]

I tried implementing this but failed miserably to keep the tests green.

Apparently in the bare checkout (https://github.com/renovatebot/renovate/blob/26.19.1/lib/util/git/index.spec.ts#L71) using --force-with-lease always fails, while a simple --forcewould still work.

Removing --bare "fixes" that but then other tests fail.

I don't know enough about git bare repos yet I guess, I might take another look next week or so.

[rarkins]

It might be easier once I merge and verify #11401

[HonkingGoose]

@herndlm PR #11401 is now merged, so maybe implementing this feature will be easier for you now? 😉

[herndlm]

Thx, I saw. I'll continue this week :)

[HonkingGoose]

Thx, I saw. I'll continue this week :)

I've assigned this issue to you, so that we - and others - can see you're going to work on the feature. 😉

[renovate-release]

🎉 This issue has been resolved in version 27.22.0 🎉

The release is available on:

• GitHub release
• 27.22.0

Your semantic-release bot 📦🚀