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.

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

Let user show/hide markers on new, ignored and untracked files #338

Merged
merged 1 commit into from
Dec 3, 2016
Merged

Let user show/hide markers on new, ignored and untracked files #338

merged 1 commit into from
Dec 3, 2016

Conversation

deathaxe
Copy link
Collaborator

The documentation of show_markers_on_untracked_file setting quite clearly says: "GitGutter shows icons for new files and ignored files."

GitGutter 1.3.0 did behave exactly like documented.

git diff is called only for files, which are not marked untracked or ignored.

GitGutter 1.4.0 shows '+' markers on each line for any file within a git repository even with show_markers_on_untracked_file: false.

git diff is called first and then a check is performed, whether the file might be untracked or ignored.

This pull request intends to revert the behaviour to as it was on 1.3.0 to satisfy documentation.

show_markers_on_untracked_file: false
-> do not show any marker on ignored, untracked or new files.

show_markers_on_untracked_file: true (Default)
-> show '*' for untracked files
-> show 'x' for ignored files
-> show '+' for new files

@r-stein
Copy link
Collaborator

r-stein commented Nov 20, 2016

We should also disable to popup in such files

@deathaxe deathaxe closed this Nov 22, 2016
@deathaxe deathaxe deleted the fix/markers-on-untracked branch November 22, 2016 20:19
@deathaxe deathaxe reopened this Nov 23, 2016
@deathaxe
Copy link
Collaborator Author

I rebased and squashed the branch to the latest master.

This was referenced Nov 28, 2016
…s_on_untracked_file is true.

By now GitGutter shows '+' markers on each line for any file within a git repository even with `show_markers_on_untracked_file: false`.
But the documentation of this setting quite clearly says: "GitGutter shows icons for new files and ignored files."
This commit is to satisfy this description.

Result:

`show_markers_on_untracked_file: false`
	-> do not show any marker on ignored, untracked or new files.

`show_markers_on_untracked_file: true` (Default)
	-> show '*' for untracked files
	-> show 'x' for ignored files
	-> show '+' for new files# Please enter the commit message for your changes. Lines starting
@deathaxe deathaxe merged commit 3852998 into jisaacks:master Dec 3, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants