From 6e209b6fdbd8e3f062793f946cc7b55c2ed958f2 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 29 Jan 2017 16:30:56 +0100 Subject: [PATCH] Look for global git/ignore in ~/.config/git, not ~/git 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. --- ignore/src/gitignore.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ignore/src/gitignore.rs b/ignore/src/gitignore.rs index 6a0bc96..7e547c2 100644 --- a/ignore/src/gitignore.rs +++ b/ignore/src/gitignore.rs @@ -454,7 +454,7 @@ fn gitconfig_contents() -> Option> { fn excludes_file_default() -> Option { 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().map(|p| p.join(".config"))) .map(|x| x.join("git/ignore")) }