enhance: only navigate to upstream if current not ahead post-fetch #1581
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
love-linger
force-pushed
the
develop
branch
6 times, most recently
from
05dba32 to
6822ae3
Compare
love-linger
force-pushed
the
develop
branch
3 times, most recently
from
072502a to
5ce919a
Compare
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.
#1127 and #1180 introduced an annoying behavior when working in a branch that tracks an inactive upstream fork. Whenever I fetch latest, the history list scrolls down to the tracking branch even when the local branch is way ahead and no new changes were found for that tracking branch.
I don't know the ideal permanent solution to this, but this PR introduces an extra check to bypass history navigation if the current branch is ahead of the tracking branch. I'm not sure what should be selected post-fetch if there's a mixture of local and remote changes (ie,
Ahead.CountandBehind.Countare non-zero).