fix: remove overly cautious divergence check and fix stale info push errors#33
Merged
fix: remove overly cautious divergence check and fix stale info push errors#33
Conversation
javoire
force-pushed
the
fix/divergence-and-stale-info
branch
2 times, most recently
from
679a20d to
a7dd2cb
Compare
javoire
force-pushed
the
fix/divergence-and-stale-info
branch
from
a7dd2cb to
e4e128d
Compare
Owner
Author
|
🎉 This PR is included in version 1.3.1 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
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
1 participant
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.
Problem
stack syncwas erroring with "local and remote have diverged" in cases where divergence is expected and normal - specifically after rebasing onto an updated parent branch. This is the standard workflow for stacked branches.Additionally,
--force-with-leasecould fail with "stale info" errors even after fetching, due to git reflog inconsistencies.Solution
Remove the divergence error - Instead of erroring when local and remote have diverged, just log it in verbose mode and continue. This is expected after rebasing onto an updated parent. The
--force-with-leasepush provides sufficient safety.Use explicit
--force-with-leasesyntax - Changed from plain--force-with-leaseto--force-with-lease=refs/heads/<branch>:<expected-sha>. This explicitly tells git what SHA we expect the remote to be, avoiding "stale info" errors that can occur when relying on implicit tracking state.Update
--forceflag description - Since it's no longer needed for the divergence case, updated the description to reflect its actual purpose: bypassing--force-with-leasesafety entirely.