From a3f5e0c3d5f5c5088979a768765f988bf73dbf69 Mon Sep 17 00:00:00 2001 From: Andrew Gallant Date: Thu, 17 Nov 2016 16:53:41 -0500 Subject: [PATCH] Use env::home_dir() instead of env::var_os(HOME). Thanks @steveklabnik! --- ignore/src/gitignore.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ignore/src/gitignore.rs b/ignore/src/gitignore.rs index 5523fa6d..6a0bc969 100644 --- a/ignore/src/gitignore.rs +++ b/ignore/src/gitignore.rs @@ -453,9 +453,9 @@ fn gitconfig_contents() -> Option> { /// Specifically, this respects XDG_CONFIG_HOME. fn excludes_file_default() -> Option { env::var_os("XDG_CONFIG_HOME") - .and_then(|x| if x.is_empty() { None } else { Some(x) }) - .or_else(|| env::var_os("HOME")) - .map(|x| PathBuf::from(x).join("git/ignore")) + .and_then(|x| if x.is_empty() { None } else { Some(PathBuf::from(x)) }) + .or_else(|| env::home_dir()) + .map(|x| x.join("git/ignore")) } /// Extract git's `core.excludesfile` config setting from the raw file contents