Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Show conflicting and unstaged state (! and ~) #40

Closed
lyze opened this issue Mar 28, 2019 · 1 comment
Closed

Show conflicting and unstaged state (! and ~) #40

lyze opened this issue Mar 28, 2019 · 1 comment
Labels
enhancement

Comments

@lyze
Copy link
Owner

lyze commented Mar 28, 2019

https://github.com/dahlbyk/posh-git/blob/15724237adb7e37fd5700d4c2f56318af174b436/src/GitPrompt.ps1#L778-L785
lyze added a commit that referenced this issue Mar 29, 2019
@lyze
Add some basic tests that to compare against posh-git.
4d854e6 
Introduce a basic testing framework that compares against posh-git upstream.
Tests do not check for color. Allow overriding the upstream expectation for
known behavioral differences.

Sadly, all of the tests introduced in this change diverge in behavior from
posh-git.

Issue #40.
lyze added a commit that referenced this issue Mar 29, 2019
@lyze
Add some basic tests that to compare against posh-git.
7131311 
Introduce a basic testing framework that compares against posh-git upstream.
Tests do not check for color. Allow overriding the upstream expectation for
known behavioral differences.

Sadly, all of the tests introduced in this change needed expectation overrides.

Issue #40.
@musm musm mentioned this issue Sep 26, 2020
Closed
@musm
Copy link

musm commented Sep 26, 2020 •
edited

Ops just saw that this is already an open issue, +1 from me for fixing this.

rdnlsmith added a commit to rdnlsmith/posh-git-sh that referenced this issue Oct 4, 2020
@rdnlsmith
Show local status summary symbol (! or ~)
ff3e9d6 
Adds a `!` at the end of the local file status indicators if the repo
has unstaged changes, or a `~` if it has uncommitted (staged) changes
but no unstaged changes.

To achieve greater consistency with upstream posh-git, neither this
symbol nor the stash indicator will appear if `bash.enableFileStatus` is
`false`. Further, the rebase indicator has been moved to _before_ the
file status indicators, and is now immediately adjacent to the branch
name/status. This commit does _not_ change the color of the rebase
indicator, which in posh-git is cyan but in posh-git-sh is currently the
default terminal foreground color.

Resolves lyze#40.
@rdnlsmith rdnlsmith mentioned this issue Oct 4, 2020
Closed
@lyze lyze closed this as completed in 9fd10d9 Oct 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Show local status summary symbol (! or ~) rdnlsmith/posh-git-sh
2 participants
@lyze @musm