fix: Branch reset causes initial Github API commit to be lost #5486
Conversation
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
Change Gogit struct to receive a pointer to allow tracking of this variable.
eb2a958 to
7ee3c6c
Compare
MattiasAng
commented
Jun 25, 2025
7ee3c6c to
ce57393
Compare
olblak
reviewed
Jun 25, 2025
olblak
approved these changes
Jun 25, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix #5463
Introduces a new variable to track if the locally checked out branch was reset from based branch. This is then utilised to make sure that the reset is pushed to remote before Github API commit is done as in its current behaviour it would be force pushed away when subsequent push it done due to remote pull failing due to a no fast-forward error.
Test
Follow steps to reproduce in corresponding issue once from latest release and then from this pull request.
In the latest release the initial commit got forced pushed away due to branch reset, while with the changes in this pull request the branch reset is pushed before any commit is done.
Additional Information
Checklist
Tradeoff
Potential improvement