Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Exclamation mark meaning #131

Closed
vorou opened this Issue Jan 15, 2014 · 5 comments

Comments

Projects
None yet
3 participants
Contributor

vorou commented Jan 15, 2014

It is said in the readme that exclamation mark denotes conflicted files. However, it also appears when there is an untracked file in working dir. Is it by design?

Owner

dahlbyk commented Jan 15, 2014

Ah... there are actually two different exclamation marks: [master|MERGE +1 ~0 -0 !3 | +1 ~0 -0 !3 !].

The !3 means there are three unresolved merge conflicts; the trailing !, as you noted, means there are untracked files. I honestly don't recall why the latter is included, since a +1 in the working directory section means the same thing.

If you don't like the latter ! you can change set $GitPromptSettings.UntrackedText = '' in your profile after posh-git loads.

vorou added a commit to vorou/posh-git that referenced this issue Jan 15, 2014

Contributor

vorou commented Jan 15, 2014

Thanks for the explanation, updated the readme.

Owner

dahlbyk commented Jan 15, 2014

Thanks! ❤️

psallandre added a commit to psallandre/posh-git that referenced this issue May 18, 2014

I'm a Linux/Mac convert, so I may be misunderstanding something really basic here, but I don't quite understand the exclamation point in the following since I do not have any untracked files.

\\dtu-storage\aakress\binary-mask-errors [master ≡ +0 ~1 -0 !]> git status
On branch master
Your branch is up-to-date with 'bit/master'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   setup/createXMLSetup.m

Furthermore, UntrackedText does not appear to be a property of $GitPromptSettings. Has there been a change in the code without an update to the README?

Exception setting "UntrackedText": "The property 'UntrackedText' cannot be found on this object. Verify that the property exists and can be set."
At line:1 char:1
+ $GitPromptSettings.UntrackedText = ''
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    + CategoryInfo          : NotSpecified: (:) [], SetValueInvocationException
    + FullyQualifiedErrorId : ExceptionWhenSetting

Thanks in advance for any help anyone can provide me!

Owner

dahlbyk commented May 4, 2016

Sorry for the confusion! In addition to adding the ahead/behind symbol, #202 also expanded the "!" to indicate any unstaged change (in contrast with "~", which indicates only staged changes).

Furthermore, UntrackedText does not appear to be a property of $GitPromptSettings. Has there been a change in the code without an update to the README?

Yes! See #202 (comment) for the adjustment. I finally got around to merging #221, but will further adjust for this settings change. Thanks for the correction!

@dahlbyk dahlbyk closed this in #281 May 12, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment