fix(git): retry non-fast-forward update errors#6207
Merged
Conversation
Signed-off-by: Jon Gaul <[email protected]>
dosubot
Bot
added
the
size:L
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## v2 #6207 +/- ##
==========================================
+ Coverage 54.80% 62.27% +7.46%
==========================================
Files 145 145
Lines 18491 14815 -3676
==========================================
- Hits 10134 9226 -908
+ Misses 7609 4829 -2780
- Partials 748 760 +12
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Verdict: approve
Clean fix — correctly fetches on non-fast-forward, re-runs the change callback against an updated filesystem, and re-pushes. Both normal-repo and bare-repo shallow cases are tested. No issues found.
🤖 Automated review by the Flipt PR review agent.
erka
reviewed
Jul 14, 2026
…orward retry Signed-off-by: Roman Dmytrenko <[email protected]>
Signed-off-by: Roman Dmytrenko <[email protected]>
erka
approved these changes
Jul 15, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
I've been frustrated trying to work with multiple branches in one go. Starting two branches and merging one meant that the other had unfixable
resource type "flipt.core.Segment": non-fast-forward update: refs/heads/flipt/prod/branch-nameerrors.Looking into it, I think that
UpdateAndPusherrors out when it should instead try a quick rebase to see whether the error goes away in this case. This PR adds in that check and retry logic as well as adds in a test to try and reproduce the error.I've checked that the test fails without the update code, but eyes on this change are greatly appreciated 🙏