forked from magicmonty/bash-git-prompt
-
Notifications
You must be signed in to change notification settings - Fork 1
Fix branch name rendering and bash compatibility #2
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
Open
MPLew-is
wants to merge
41
commits into
geksiong:zsh-support
Choose a base branch
from
MPLew-is:zsh-support
base: zsh-support
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
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.
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
README: remove spaces that increase horisontal scroll
Make username and host colors the same. I have no idea why I made them different in the first place. Tighten spacing. Change "@" char to bold bright white. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This theme is based on Solarized_UserHost and my posh-git theme for PowerShell which is here: https://github.com/rkitover/windows-dev-guide#set-up-powershell-profile Signed-off-by: Rafael Kitover <rkitover@gmail.com>
When deciding what bits of output should be included in the status line, the variables that configure this aren't exported, which means any relevant configuration changes don't work. Fixes magicmonty#474.
Allows git status take the global core.excludesFile into account. Otherwise, the reported number of untracked files is incorrect.
Clean up whitespace, fix source URL, license.
This reverts commit 5da0a40.
Additional fix when ${GIT_PROMPT_PREFIX} or ${GIT_PROMPT_SUFFIX}
contain color sequences git_prompt_help's formatting was wrong
Add space after the dot in staged indicator
…n termux) Private index was tried to create in nonexistent location, no error was ever displayed, and then unconditionally GIT_INDEX_FILE variable was set pointing to nonexistent path. Git used this location and reported many changed files. It is common on Android devices - there is no /tmp directory Termux creates one and sets TMPDIR variable, which is commonly honored by most of unix utilities. Fixes issue magicmonty#338 - Fixes behaviour if `/tmp` dir does not exist
Additionally in case of nonexistent index file (i.e. when `/tmp` does not exist) most of files were marked with 'D' in second loop pass of `gitstatus.sh` which was wrongly identified as 'Stashed'. Now it is idenified as 'changed'
The longer the directory structure, the more convenient and useful is a new-line.
* It has three styles of prompt. * It is configurable * the visible sections and the order of the sections, * where to show icons. * This theme is not using most of the old configuration variables, it has new ones. To use this new version of the theme, please read the theme documentation.
- Use added `NewLine` variable for zsh-specific newline - `Time12a` variant added for zsh
Without quotes, the test will succeed even when the variable is not defined.
The use of zsh `&!` syntax was causing bash to die in script parsing, even though this never gets executed. This adds `true` as a dummy command to get past parsing and allow both bash and zsh to execute the script.
bfb46e5 to
8300c6e
Compare
This function was renamed upstream, but the rename was clobbered during rebase.
`==` is only (semi-)portable when used with `[[`.
This was referenced Feb 21, 2023
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.
&!syntax by itself causes a parsing error (f02362a)${GIT_BRANCH}under zsh, since the security fix in [security] Fix for #310 magicmonty/bash-git-prompt#313 breaks that (4bb7adb)