-
Notifications
You must be signed in to change notification settings - Fork 990
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Resolve symlink before getting branch name #1958 #2031
Open
BlitzKraft
wants to merge
12
commits into
powerline:develop
Choose a base branch
from
BlitzKraft:1958-git-branch-mismatch
base: develop
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Resolve symlink before getting branch name #1958 #2031
BlitzKraft
wants to merge
12
commits into
powerline:develop
from
BlitzKraft:1958-git-branch-mismatch
Conversation
This file contains 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
PH111P
reviewed
Oct 15, 2019
Fixes powerline#1958. Instead of attempting to resolve at each vcs module, the get_branch_name always uses the realpath to cache branch names.
I misspoke. The issue is not fixed yet. I made a mistake when testing it on my system and (wrongly) concluded it's fixed. |
Current settings leads to the following under tmux (on the right side):
* Replaced tmux display with proper formatting of things already available * Removed client_pid as it is not available * Also removed other occurrences of explicit `tmux execution`
Needs tests.
Fixes powerline#1958. Instead of attempting to resolve at each vcs module, the get_branch_name always uses the realpath to cache branch names.
…rline into 1958-git-branch-mismatch
Seems I messed up rebasing. Need to squash merge this one, I think. |
PH111P
approved these changes
Oct 26, 2019
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.
Tests are missing. Need to write a try/catch for versions of python pre 3.4.