Look for global git/ignore in ~/.config/git, not ~/git #343
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
BurntSushi
requested changes
Jan 29, 2017
| @@ -454,7 +454,7 @@ fn gitconfig_contents() -> Option<Vec<u8>> { | |||
| fn excludes_file_default() -> Option<PathBuf> { | |||
| env::var_os("XDG_CONFIG_HOME") | |||
| .and_then(|x| if x.is_empty() { None } else { Some(PathBuf::from(x)) }) | |||
| .or_else(|| env::home_dir()) | |||
| .or_else(|| env::home_dir().join(".config")) | |||
There was a problem hiding this comment.
I think you need env::home_dir().map(|p| p.join(".config")) since env::home_dir() returns an Option<PathBuf>.
There was a problem hiding this comment.
That worked, thanks!
The documentation says: > If `$XDG_CONFIG_HOME` is not set or is empty, then > `$HOME/.config/git/ignore` is used instead. This is the expected behavior, but the code looked at ~/git/ignore instead.
blueyed
force-pushed
the
home-config-for-git-ignore
branch
from
d145f28 to
3a4748f
Compare
BurntSushi
approved these changes
Jan 30, 2017
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.
The documentation says:
This is the expected behavior, but the code looked at ~/git/ignore
instead.
This is my first Rust code, so it might be wrong..!